27 Commits

Author SHA1 Message Date
44dbbdc56b offline docs by default. 2026-07-08 11:54:44 -06:00
deepend-tildeclub
cfb19820fa Merge pull request #330 from ZoiteChat/Windows/python38-support
Add Python 3.8 support for older windows versions.
2026-07-08 10:00:31 -06:00
deepend-tildeclub
e05ca13608 Merge pull request #335 from ZoiteChat/color-tooltips
Add mouse over tooltips for each color selection.
2026-07-08 09:44:10 -06:00
deepend-tildeclub
15cf96c01f Merge pull request #336 from ZoiteChat/win32-taskbar-fix
Fix Windows taskbar click not minimizing the window
2026-07-08 09:31:04 -06:00
2caec91a0f Improve color tooltip design 2026-07-08 00:58:34 -06:00
9465a1e0a8 Fix Windows taskbar click not minimizing the window 2026-07-07 23:44:22 -06:00
251272c708 Applying: Fix Windows 7 crash after connecting when Python plugin init fails 2026-07-07 19:04:51 -06:00
f068a0e0fa Fix Windows Python plugin DLL selection 2026-07-07 15:34:11 -06:00
d0034cd112 Fixed missing comma in color tooltips 2026-07-07 14:14:36 -06:00
ae6d5ebeef Add mouse over tooltips for each color selection. 2026-07-07 09:08:00 -06:00
deepend-tildeclub
8466e70424 Merge pull request #329 from ZoiteChat/implement-issue-326
Adjust default text-event colors
2026-07-06 23:46:48 -06:00
c3d8f27f48 Add Python 3.8 support for older windows versions. 2026-07-06 01:37:59 -06:00
b85229f1a1 Adjust default text-event colors 2026-07-05 23:54:49 -06:00
deepend-tildeclub
d03298a048 Merge pull request #325 from ZoiteChat/fix-chat-scrollbar-stepper-scrolling
Fix chat scrollbar step increment for arrow scrolling
2026-07-05 15:07:25 -06:00
deepend-tildeclub
798e0b487e Merge pull request #324 from ZoiteChat/fix-nickserv-pass-auth
Fix NickServ auth to use decrypted active password
2026-07-05 13:50:48 -06:00
49444d72b4 Fix chat scrollbar step increment for arrow scrolling 2026-07-05 13:38:26 -06:00
deepend-tildeclub
c0e0fe4dcb Merge pull request #319 from ZoiteChat/css-use-after-free-fix
Fix channel tree font ownership/lifetime
2026-07-04 20:07:58 -06:00
deepend-tildeclub
9a189848ea Merge pull request #318 from ZoiteChat/windows-browser-preference
Prefer ShellExecuteW for Windows URL opens
2026-07-04 20:07:37 -06:00
96b09bfc1d Fix NickServ auth to use decrypted active password 2026-07-04 20:04:11 -06:00
9a6c913d89 Fix channel tree font ownership/lifetime 2026-07-02 13:08:48 -06:00
42010594be Prefer ShellExecuteW for Windows URL opens 2026-07-02 13:02:09 -06:00
5469c30b75 Update GPLv2 text, Add feature request template. 2026-07-01 18:25:48 -06:00
fe9a2ee202 Preparation for 2.18.3 2026-06-29 20:49:41 -06:00
deepend-tildeclub
5e27dc7e9f Merge pull request #315 from ZoiteChat/python-script-compatibility-fix
Snapshot Python hooks during plugin unload
2026-06-29 20:41:00 -06:00
deepend-tildeclub
69d083e3c0 Merge pull request #314 from ZoiteChat/openssl4-build-fixes
Support OpenSSL 4 APIs
2026-06-29 20:38:39 -06:00
2b95f9724e Snapshot Python hooks during plugin unload 2026-06-29 19:13:18 -06:00
4066a07892 Support OpenSSL 4 API 2026-06-29 18:47:46 -06:00
37 changed files with 1116 additions and 319 deletions

View File

@@ -0,0 +1,57 @@
---
name: Feature request
about: Suggest an improvement for ZoiteChat
title: "[Feature]: "
labels: enhancement
assignees: ""
---
## Summary
```text
Describe the feature or enhancement clearly and briefly.
```
## Problem
```text
What problem would this solve?
```
## Proposed Solution
```text
How should ZoiteChat behave?
```
## Alternatives Considered
```text
Other approaches or workarounds you considered.
```
## Use Case
```text
Who benefits from this, and when would they use it?
```
## Platform Details
```text
OS:
ZoiteChat version:
Build/source: GitHub release / Fedora package / source build / Windows installer / other
```
## Checklist
* [ ] I searched existing issues first.
* [ ] I checked whether this already exists in the latest ZoiteChat version available to me.
* [ ] I explained the problem this would solve.
## Extra Notes
```text
Anything else that might help.
```

View File

@@ -37,6 +37,7 @@ jobs:
liblua5.4-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
fonts-noto-color-emoji breeze-gtk-theme \
python3-venv \
patchelf file curl
- name: Configure
@@ -206,6 +207,10 @@ jobs:
export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/zoitechat/plugins"
fi
if [ -f "$APPDIR/usr/share/doc/zoitechat/html/index.html" ]; then
export ZOITECHAT_DOCDIR="$APPDIR/usr/share/doc/zoitechat/html"
fi
if [ -d "$APPDIR/usr/share/glib-2.0/schemas" ]; then
export GSETTINGS_SCHEMA_DIR="$APPDIR/usr/share/glib-2.0/schemas${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
fi

View File

@@ -113,6 +113,33 @@ jobs:
New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
}
# Runs while Python 3.14 is still the active interpreter; the installer
# packages rel\offline-docs as the "Offline Documentation" component and
# skips it if this step could not build the docs.
- name: Build offline documentation
run: |
python data\misc\build_offline_docs.py --output ..\zoitechat-build\${{ matrix.platform }}\rel\offline-docs
- uses: actions/setup-python@v6
with:
python-version: '3.8.10'
architecture: ${{ matrix.arch }}
- name: Prepare Python 3.8
run: |
python -m pip install --upgrade pip
python -m pip install cffi
$pyRoot = $env:pythonLocation
if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
foreach ($pyDir in @("C:\gtk-build\python-3.8.10", "C:\gtk-build\python-3.8")) {
New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
$target = Join-Path $pyDir "${{ matrix.platform }}"
if (Test-Path $target) { Remove-Item $target -Recurse -Force }
New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
}
- name: Build
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
@@ -124,12 +151,33 @@ jobs:
exit /b 1
)
set "PYTHON38_DIR=C:\gtk-build\python-3.8\${{ matrix.platform }}"
if not exist "%PYTHON38_DIR%\libs\python38.lib" (
echo Missing %PYTHON38_DIR%\libs\python38.lib
dir "%PYTHON38_DIR%\libs"
exit /b 1
)
if not exist "%PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd" (
echo Missing %PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd
exit /b 1
)
set "LIB=%PYTHON_DIR%\libs;%LIB%"
set "INCLUDE=%PYTHON_DIR%\include;%INCLUDE%"
powershell -NoProfile -ExecutionPolicy Bypass -Command "$archiveLib='C:\gtk-build\gtk\x64\release\lib\libarchive.lib'; if (-not (Test-Path $archiveLib)) { $archiveDll = Get-ChildItem 'C:\gtk-build\gtk\x64\release\bin\libarchive*.dll' | Select-Object -First 1; if ($archiveDll) { Push-Location 'C:\gtk-build\gtk\x64\release\lib'; & 'C:\gtk-build\gendef\gendef.exe' $archiveDll.FullName | Out-Null; $archiveDef = Get-ChildItem 'libarchive*.def' | Select-Object -First 1; if ($archiveDef) { & lib /def:$archiveDef.Name /machine:${{ matrix.platform }} /out:libarchive.lib | Out-Null }; Pop-Location } }"
msbuild win32\zoitechat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
if errorlevel 1 exit /b 1
if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\plugins\hcpython38.dll" (
echo hcpython38.dll was not built
exit /b 1
)
if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\_cffi_backend.cp38*.pyd" (
echo _cffi_backend for Python 3.8 was not staged for the installer
exit /b 1
)
shell: cmd
- name: Preparing Artifacts

46
COPYING
View File

@@ -1,12 +1,12 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
Copyright (C) 1989, 1991 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
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ 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.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
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
@@ -291,7 +291,7 @@ convey 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) 19yy <name of author>
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
@@ -303,17 +303,15 @@ the "copyright" line and a pointer to where the full notice is found.
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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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 is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision 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.
@@ -330,11 +328,11 @@ necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
<signature of Moe Ghoul>, 1 April 1989
Moe Ghoul, President of Vice
This 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 Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

View File

@@ -1,6 +1,17 @@
ZoiteChat ChangeLog
=================
2.18.3 (2026-06-29)
-------------------
- Added IRCv3 support for message tags, echo-message, typing notifications, and replies.
- Restored the accept-invalid-cert TLS bypass behavior.
- Replaced legacy IPv4 APIs and added support for OpenSSL 4 APIs.
- Snapshot Python hooks during plugin unload for safer plugin shutdown.
- Fixed Windows GtkStatusIcon tray menu popup behavior.
- Fixed self-echoed private messages routing to the target tab.
- Fixed the lag ping timeout window.
2.18.2 (2026-06-20)
-------------------

View File

@@ -6,4 +6,29 @@ if get_option('gtk-frontend')
subdir('icons')
subdir('misc')
subdir('man')
# Fetch and build the offline manual so Help->Contents works without
# connectivity. 'auto' skips with a warning when the docs cannot be
# fetched (e.g. network-less distro builds, which ship docs themselves);
# 'enabled' makes that a hard error.
offline_docs_opt = get_option('offline-docs')
if not offline_docs_opt.disabled()
offline_docs_args = [
'--repo', get_option('offline-docs-repo'),
'--output', join_paths(meson.current_build_dir(), 'offline-docs'),
'--stamp', '@OUTPUT@',
]
if offline_docs_opt.enabled()
offline_docs_args += ['--strict']
endif
custom_target('offline-docs',
output: 'offline-docs.stamp',
command: [find_program('python3'), files('misc/build_offline_docs.py')] + offline_docs_args,
build_by_default: true,
)
meson.add_install_script(files('misc/install_offline_docs.py'),
join_paths(meson.current_build_dir(), 'offline-docs'),
offline_docs_dir,
)
endif
endif

View File

@@ -0,0 +1,133 @@
#!/usr/bin/env python3
"""Build ZoiteChat's offline HTML documentation for bundling with releases.
Clones the ZoiteChat/documentation repository, preferring a tag that
matches this source tree's version so the bundled manual matches the
application, and builds it with Sphinx into --output. Used by the
meson build (offline-docs option) and by the Windows CI workflow.
Sphinx is installed into a throwaway virtualenv so the invoking Python
(which the Windows build also bundles pieces of) is left untouched.
Unless --strict is given, any failure prints a warning (GitHub Actions
annotation syntax) and exits 0: builds then simply fall back to opening
the online manual instead of failing outright.
"""
import argparse
import pathlib
import re
import shutil
import subprocess
import sys
import tempfile
DEFAULT_REPO = "https://github.com/ZoiteChat/documentation.git"
def project_version() -> str:
meson_build = pathlib.Path(__file__).resolve().parents[2] / "meson.build"
match = re.search(r"version\s*:\s*'([^']+)'", meson_build.read_text(encoding="utf-8"))
if not match:
raise RuntimeError(f"could not parse project version from {meson_build}")
return match.group(1)
def run(argv, **kwargs) -> None:
print("+", " ".join(str(arg) for arg in argv), flush=True)
subprocess.run(argv, check=True, **kwargs)
def clone_docs(repo: str, version: str, target: pathlib.Path) -> str:
# A missing tag falls through to the default branch so the docs may be
# newer than the app, which beats shipping none at all.
for ref in (f"v{version}", version, None):
cmd = ["git", "clone", "--depth", "1"]
if ref:
cmd += ["--branch", ref]
cmd += [repo, str(target)]
try:
run(cmd)
return ref or "default branch"
except subprocess.CalledProcessError:
shutil.rmtree(target, ignore_errors=True)
raise RuntimeError(f"could not clone {repo}")
def find_source_dir(checkout: pathlib.Path) -> pathlib.Path:
for candidate in (checkout, checkout / "docs", checkout / "doc"):
if (candidate / "conf.py").is_file():
return candidate
raise RuntimeError(f"no Sphinx conf.py found in {checkout}")
def venv_python(venv_dir: pathlib.Path) -> pathlib.Path:
if sys.platform == "win32":
return venv_dir / "Scripts" / "python.exe"
return venv_dir / "bin" / "python"
def build(output: pathlib.Path, repo: str, version: str) -> None:
with tempfile.TemporaryDirectory(prefix="zoitechat-docs-") as tmp:
tmp_dir = pathlib.Path(tmp)
checkout = tmp_dir / "documentation"
html_dir = tmp_dir / "html"
venv_dir = tmp_dir / "venv"
ref = clone_docs(repo, version, checkout)
print(f"building documentation from {ref}", flush=True)
source_dir = find_source_dir(checkout)
run([sys.executable, "-m", "venv", str(venv_dir)])
python = venv_python(venv_dir)
requirements = source_dir / "requirements.txt"
if not requirements.is_file():
requirements = checkout / "requirements.txt"
if requirements.is_file():
run([python, "-m", "pip", "install", "--quiet", "-r", str(requirements)])
run([python, "-m", "pip", "install", "--quiet", "sphinx"])
else:
run([python, "-m", "pip", "install", "--quiet", "sphinx", "sphinx_rtd_theme"])
run([python, "-m", "sphinx", "-b", "html", str(source_dir), str(html_dir)])
if not (html_dir / "index.html").is_file():
raise RuntimeError("Sphinx build produced no index.html")
if output.exists():
shutil.rmtree(output)
shutil.copytree(html_dir, output,
ignore=shutil.ignore_patterns(".doctrees", ".buildinfo"))
file_count = sum(1 for path in output.rglob("*") if path.is_file())
print(f"offline documentation staged at {output} ({file_count} files)", flush=True)
def main() -> int:
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("--output", required=True, type=pathlib.Path,
help="directory to stage the built HTML tree into")
parser.add_argument("--repo", default=DEFAULT_REPO,
help="documentation git repository to build from")
parser.add_argument("--version", default=None,
help="app version used to pick a matching docs tag "
"(default: parsed from meson.build)")
parser.add_argument("--strict", action="store_true",
help="fail on error instead of emitting a warning")
parser.add_argument("--stamp", type=pathlib.Path, default=None,
help="file to touch on completion (meson target output)")
args = parser.parse_args()
try:
build(args.output, args.repo, args.version or project_version())
except Exception as error: # noqa: BLE001 - degrade to website-only help
if args.strict:
raise
print(f"::warning::offline documentation not bundled: {error}", flush=True)
if args.stamp:
args.stamp.write_text("ok\n", encoding="utf-8")
return 0
if __name__ == "__main__":
sys.exit(main())

View File

@@ -0,0 +1,31 @@
#!/usr/bin/env python3
"""Meson install helper: copy the built offline docs into the install tree.
Silently skips when the docs were not built (offline-docs=auto without
network); Help->Contents then falls back to the online manual.
"""
import os
import pathlib
import shutil
import sys
src = pathlib.Path(sys.argv[1])
dest_arg = pathlib.PurePath(sys.argv[2])
if not (src / "index.html").is_file():
print("offline documentation was not built; skipping install")
sys.exit(0)
if dest_arg.is_absolute():
# An absolute offline-docs-dir lands outside the prefix; honour DESTDIR
destdir = os.environ.get("DESTDIR", "")
dest = pathlib.Path(destdir + str(dest_arg)) if destdir else pathlib.Path(dest_arg)
else:
dest = pathlib.Path(os.environ["MESON_INSTALL_DESTDIR_PREFIX"]) / dest_arg
if dest.exists():
shutil.rmtree(dest)
dest.parent.mkdir(parents=True, exist_ok=True)
shutil.copytree(src, dest)
print(f"Installed offline documentation to {dest}")

View File

@@ -29,6 +29,19 @@
<id>zoitechat.desktop</id>
</provides>
<releases>
<release date="2026-06-29" version="2.18.3">
<description>
<ul>
<li>Added IRCv3 support for message tags, echo-message, typing notifications, and replies.</li>
<li>Restored the accept-invalid-cert TLS bypass behavior.</li>
<li>Replaced legacy IPv4 APIs and added support for OpenSSL 4 APIs.</li>
<li>Snapshot Python hooks during plugin unload for safer plugin shutdown.</li>
<li>Fixed Windows GtkStatusIcon tray menu popup behavior.</li>
<li>Fixed self-echoed private messages routing to the target tab.</li>
<li>Fixed the lag ping timeout window.</li>
</ul>
</description>
</release>
<release date="2026-06-20" version="2.18.2">
<description>
<p>Security and connections:</p>

View File

@@ -1,5 +1,5 @@
project('zoitechat', 'c',
version: '2.18.2',
version: '2.18.3',
meson_version: '>= 0.55.0',
default_options: [
'c_std=c17',
@@ -35,6 +35,16 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('GETTEXT_PACKAGE', 'zoitechat')
config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
get_option('datadir'), 'locale'))
# Where Help->Contents looks for locally installed documentation before
# falling back to the online manual. Packagers that ship the HTML docs
# elsewhere can point this at their doc directory.
offline_docs_dir = get_option('offline-docs-dir')
if offline_docs_dir == ''
offline_docs_dir = join_paths(get_option('datadir'), 'doc', 'zoitechat', 'html')
endif
config_h.set_quoted('ZOITECHATDOCDIR', join_paths(get_option('prefix'), offline_docs_dir))
config_h.set10('ENABLE_NLS', true)
# Optional features

View File

@@ -33,6 +33,15 @@ option('install-appdata', type: 'boolean',
option('install-plugin-metainfo', type: 'boolean', value: false,
description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
)
option('offline-docs', type: 'feature', value: 'auto',
description: 'Fetch, build and install the offline HTML documentation (needs network at build time); auto skips with a warning when unavailable'
)
option('offline-docs-dir', type: 'string', value: '',
description: 'Directory searched for offline HTML documentation (index.html), absolute or relative to prefix. Defaults to $datadir/doc/zoitechat/html'
)
option('offline-docs-repo', type: 'string', value: 'https://github.com/ZoiteChat/documentation.git',
description: 'Git repository the offline documentation is built from'
)
# Plugins
option('with-checksum', type: 'boolean',

View File

@@ -1,5 +1,5 @@
Name: zoitechat
Version: 2.18.2
Version: 2.18.3
Release: %autorelease
Summary: HexChat-based IRC client
License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception

View File

@@ -53,6 +53,16 @@ builder.set_source('_zoitechat_embedded', '''
#include "config.h"
#include "zoitechat-plugin.h"
#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#endif
static zoitechat_plugin *ph;
CFFI_DLLEXPORT int _on_plugin_init(char **, char **, char **, char *, char *);
CFFI_DLLEXPORT int _on_plugin_deinit(void);
@@ -61,6 +71,20 @@ int zoitechat_plugin_init(zoitechat_plugin *plugin_handle,
char **name_out, char **description_out,
char **version_out, char *arg)
{
#ifdef _WIN32
/* CPython cannot be removed from a process once Py_Initialize has run.
If the embedded interpreter fails to start (e.g. _cffi_backend is
missing), the host responds to our 0 return by g_module_close()ing
this plugin, which would also drop the last reference to pythonXY.dll
and unload it mid-flight; the leftover process-global state then
crashes the process later, e.g. when a server connection spawns the
next thread. Pin this module so FreeLibrary can never unload it. */
HMODULE self_handle;
GetModuleHandleExW (GET_MODULE_HANDLE_EX_FLAG_PIN |
GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
(LPCWSTR)&zoitechat_plugin_init, &self_handle);
#endif
if (ph != NULL)
{
puts ("Python plugin already loaded\\n");

View File

@@ -19,7 +19,7 @@ else:
if not hasattr(sys, 'argv'):
sys.argv = ['<zoitechat>']
VERSION = b'2.18.2'
VERSION = b'2.18.3'
PLUGIN_NAME = ffi.new('char[]', b'Python')
PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
PLUGIN_VERSION = ffi.new('char[]', VERSION)
@@ -173,7 +173,7 @@ class Plugin:
def __del__(self):
log('unloading', self.filename)
for hook in self.hooks:
for hook in list(self.hooks):
if hook.is_unload is True:
try:
hook.callback(hook.userdata)

View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v142</PlatformToolset>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D58924D2-1492-4AC3-B058-7A214424EEDC}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>python38</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\win32\zoitechat.props" />
<PropertyGroup>
<TargetName>$(Python38Output)</TargetName>
<OutDir>$(ZoiteChatRel)plugins\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;Py_NO_LINK_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions>_DEBUG;Py_DEBUG;Py_REF_DEBUG;Py_TRACE_REFS;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<AdditionalOptions>/U_DEBUG /UPy_DEBUG /UPy_REF_DEBUG /UPy_TRACE_REFS %(AdditionalOptions)</AdditionalOptions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>$(Glib);$(Python38Path)\include;..\..\src\common;$(ZoiteChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<ModuleDefinitionFile>python.def</ModuleDefinitionFile>
<AdditionalDependencies>"$(Python38Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python38Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Command>"$(Python38Path)\python.exe" generate_plugin.py ..\..\src\common\zoitechat-plugin.h python.py "$(IntDir)python.c"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="generate_plugin.py" />
<None Include="zoitechat.py" />
<None Include="python.def" />
<None Include="python.py" />
<None Include="xchat.py" />
<None Include="hexchat.py" />
<None Include="_zoitechat.py" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(IntDir)python.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

View File

@@ -1815,14 +1815,14 @@ inbound_login_end (session *sess, char *text, const message_tags_data *tags_data
return;
/* send nickserv password */
if (net && net->pass && inbound_nickserv_login (serv))
if (net && serv->password[0] && inbound_nickserv_login (serv))
{
serv->p_ns_identify (serv, net->pass);
serv->p_ns_identify (serv, serv->password);
}
/* wait for join if command or nickserv set */
if (net && prefs.hex_irc_join_delay
&& ((net->pass && inbound_nickserv_login (serv))
&& ((serv->password[0] && inbound_nickserv_login (serv))
|| net->commandlist))
{
serv->joindelay_tag = fe_timeout_add_seconds (prefs.hex_irc_join_delay, check_autojoin_channels, serv);

View File

@@ -4868,9 +4868,9 @@ command_insert_vars (session *sess, char *cmd)
break;
case 'p':
if (mynet->pass)
if (sess->server->password[0])
{
g_string_append (expanded, mynet->pass);
g_string_append (expanded, sess->server->password);
}
cmd++;
break;

View File

@@ -25,6 +25,7 @@
#ifdef WIN32
#include <io.h>
#include <windows.h>
#else
#include <unistd.h>
#endif
@@ -56,6 +57,36 @@ typedef struct session zoitechat_context;
#endif
#define DEBUG(x) {x;}
#ifdef WIN32
/* Python >= 3.9 dropped support for Windows versions before 10, so those
* systems get a Python 3.8 build of the plugin instead. RtlGetVersion is
* used because GetVersionEx reports a version capped by the compatibility
* manifest rather than the real one. */
static gboolean
plugin_windows_needs_python38 (void)
{
typedef LONG (WINAPI *rtl_get_version_func) (PRTL_OSVERSIONINFOW);
rtl_get_version_func rtl_get_version;
RTL_OSVERSIONINFOW version;
HMODULE ntdll;
ntdll = GetModuleHandleW (L"ntdll.dll");
if (ntdll == NULL)
return FALSE;
rtl_get_version = (rtl_get_version_func) GetProcAddress (ntdll, "RtlGetVersion");
if (rtl_get_version == NULL)
return FALSE;
memset (&version, 0, sizeof (version));
version.dwOSVersionInfoSize = sizeof (version);
if (rtl_get_version (&version) != 0)
return FALSE;
return version.dwMajorVersion < 10;
}
#endif
/* crafted to be an even 32 bytes */
struct _zoitechat_hook
@@ -491,7 +522,10 @@ plugin_auto_load (session *sess)
for_files (lib_dir, "hcfishlim.dll", plugin_auto_load_cb);
for_files(lib_dir, "hclua.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcperl.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);
if (plugin_windows_needs_python38 ())
for_files (lib_dir, "hcpython38.dll", plugin_auto_load_cb);
else
for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcupd.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcsysinfo.dll", plugin_auto_load_cb);
#else

View File

@@ -154,7 +154,7 @@ int
_SSL_get_cert_info (struct cert_info *cert_info, SSL * ssl)
{
X509 *peer_cert;
X509_PUBKEY *key;
const X509_PUBKEY *key;
X509_ALGOR *algor = NULL;
EVP_PKEY *peer_pkey;
char notBefore[64];
@@ -350,7 +350,7 @@ _SSL_close (SSL * ssl)
{
SSL_set_shutdown (ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
SSL_free (ssl);
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if !defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_NUMBER < 0x10100000L
#ifdef HAVE_ERR_REMOVE_THREAD_STATE
ERR_remove_thread_state (NULL);
#else
@@ -507,9 +507,12 @@ _SSL_check_subject_altname (X509 *cert, const char *host)
static int
_SSL_check_common_name (X509 *cert, const char *host)
{
X509_NAME *name;
char *common_name = NULL;
const X509_NAME *name;
const X509_NAME_ENTRY *entry;
const ASN1_STRING *common_name_asn1;
const unsigned char *common_name;
int common_name_len;
int common_name_index;
int rv = -1;
GInetAddress *addr;
@@ -517,16 +520,27 @@ _SSL_check_common_name (X509 *cert, const char *host)
if (name == NULL)
return -1;
common_name_len = X509_NAME_get_text_by_NID (name, NID_commonName, NULL, 0);
if (common_name_len < 0)
common_name_index = X509_NAME_get_index_by_NID (name, NID_commonName, -1);
if (common_name_index < 0)
return -1;
common_name = g_malloc0 (common_name_len + 1);
entry = X509_NAME_get_entry (name, common_name_index);
if (entry == NULL)
return -1;
X509_NAME_get_text_by_NID (name, NID_commonName, common_name, common_name_len + 1);
common_name_asn1 = X509_NAME_ENTRY_get_data (entry);
if (common_name_asn1 == NULL)
return -1;
#ifdef HAVE_ASN1_STRING_GET0_DATA
common_name = ASN1_STRING_get0_data (common_name_asn1);
#else
common_name = ASN1_STRING_data (common_name_asn1);
#endif
common_name_len = ASN1_STRING_length (common_name_asn1);
/* NUL bytes in CN? */
if (common_name_len != (int)strlen(common_name))
if (common_name_len != (int)strlen((const char *)common_name))
{
g_warning ("NUL byte in Common Name field, probably a malicious certificate.\n");
rv = -2;
@@ -539,18 +553,17 @@ _SSL_check_common_name (X509 *cert, const char *host)
* We don't want to attempt wildcard matching against IP
* addresses, so perform a simple comparison here.
*/
if (g_strcmp0 (common_name, host) == 0)
if (g_strcmp0 ((const char *)common_name, host) == 0)
rv = 0;
else
rv = -1;
g_object_unref (addr);
}
else if (_SSL_match_hostname (common_name, host) == 0)
else if (_SSL_match_hostname ((const char *)common_name, host) == 0)
rv = 0;
out:
g_free(common_name);
return rv;
}

View File

@@ -1695,6 +1695,97 @@ pevent_load (char *filename)
return 0;
}
static gboolean
text_event_uses_color (const char *text, int color)
{
const char *p;
if (!text || color < 0 || color > 31)
return FALSE;
for (p = text; *p; p++)
{
int value;
int digits;
if ((unsigned char) *p == 3)
p++;
else if (*p == '%' && p[1] == 'C')
p += 2;
else
continue;
if (!g_ascii_isdigit (*p))
{
p--;
continue;
}
value = *p - '0';
digits = 1;
if (g_ascii_isdigit (p[1]))
{
value = value * 10 + p[1] - '0';
digits = 2;
}
if (value == color)
return TRUE;
p += digits - 1;
if (*p == ',' && g_ascii_isdigit (p[1]))
{
p++;
value = *p - '0';
if (g_ascii_isdigit (p[1]))
{
value = value * 10 + p[1] - '0';
p++;
}
if (value == color)
return TRUE;
}
}
return FALSE;
}
char **
text_color_event_names (int color, int *count)
{
GPtrArray *names;
int found = 0;
int i;
if (count)
*count = 0;
names = g_ptr_array_new ();
for (i = 0; i < NUM_XP; i++)
{
const char *text = pntevts_text[i] ? pntevts_text[i] : te[i].def;
if (!text_event_uses_color (text, color))
continue;
g_ptr_array_add (names, g_strdup (_(te[i].name)));
found++;
}
if (!found)
{
g_ptr_array_free (names, TRUE);
return NULL;
}
g_ptr_array_add (names, NULL);
if (count)
*count = found;
return (char **) g_ptr_array_free (names, FALSE);
}
static void
pevent_check_all_loaded (void)
{

View File

@@ -53,6 +53,7 @@ int pevt_build_string (const char *input, char **output, int *max_arg);
int pevent_load (char *filename);
void pevent_make_pntevts (void);
int text_color_of (char *name);
char **text_color_event_names (int color, int *count);
void text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
time_t timestamp);
int text_emit_by_name (char *name, session *sess, time_t timestamp,

File diff suppressed because it is too large Load Diff

View File

@@ -79,6 +79,8 @@ struct _chanview
guint theme_listener_id;
};
static void chanview_set_font_desc (chanview *cv, const PangoFontDescription *font_desc);
struct _chan
{
chanview *cv; /* our owner */
@@ -169,6 +171,7 @@ chanview_apply_theme (chanview *cv)
w = GTK_WIDGET (tv->tree);
if (input_style)
font = input_style->font_desc;
chanview_set_font_desc (cv, font);
theme_manager_apply_channel_tree_style (w,
theme_manager_get_channel_tree_palette_behavior (font));
@@ -313,6 +316,14 @@ chanview_free_ch (chanview *cv, GtkTreeIter *iter)
g_free (ch);
}
static void
chanview_set_font_desc (chanview *cv, const PangoFontDescription *font_desc)
{
if (cv->font_desc)
pango_font_description_free (cv->font_desc);
cv->font_desc = font_desc ? pango_font_description_copy (font_desc) : NULL;
}
static void
chanview_destroy_store (chanview *cv) /* free every (chan *) in the store */
{
@@ -335,6 +346,9 @@ chanview_destroy (chanview *cv)
if (cv->box)
gtk_widget_destroy (cv->box);
if (cv->font_desc)
pango_font_description_free (cv->font_desc);
chanview_destroy_store (cv);
g_free (cv);
}
@@ -356,7 +370,7 @@ chanview_new (int type, int trunc_len, gboolean sort, gboolean use_icons,
cv = g_new0 (chanview, 1);
cv->store = gtk_tree_store_new (5, G_TYPE_STRING, G_TYPE_POINTER,
PANGO_TYPE_ATTR_LIST, GDK_TYPE_PIXBUF, G_TYPE_INT);
cv->font_desc = font_desc;
cv->font_desc = font_desc ? pango_font_description_copy (font_desc) : NULL;
cv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
cv->trunc_len = trunc_len;
cv->sorted = sort;

View File

@@ -1357,17 +1357,19 @@ fe_open_url_inner (const char *url)
gboolean opened = FALSE;
#ifdef WIN32
opened = g_app_info_launch_default_for_uri (escaped_url, NULL, &error);
gunichar2 *url_utf16 = g_utf8_to_utf16 (escaped_url, -1, NULL, NULL, NULL);
if (url_utf16 != NULL)
{
opened = ((INT_PTR) ShellExecuteW (0, L"open", url_utf16, NULL, NULL, SW_SHOWNORMAL)) > 32;
g_free (url_utf16);
}
if (!opened)
{
g_clear_error (&error);
gunichar2 *url_utf16 = g_utf8_to_utf16 (escaped_url, -1, NULL, NULL, NULL);
if (url_utf16 != NULL)
{
opened = ((INT_PTR) ShellExecuteW (0, L"open", url_utf16, NULL, NULL, SW_SHOWNORMAL)) > 32;
g_free (url_utf16);
}
opened = g_app_info_launch_default_for_uri (escaped_url, NULL, &error);
if (!opened)
g_clear_error (&error);
}
#else
{

View File

@@ -67,6 +67,34 @@
#include <shellapi.h>
#include <gdk/gdkwin32.h>
/* The shell only minimizes a window from its taskbar button when the
* window style carries WS_MINIMIZEBOX; without it the click merely
* deactivates the window (issue #65). GTK3 older than 3.24.50 can drop
* the bit from top-level windows (https://gitlab.gnome.org/GNOME/gtk/-/issues/7494),
* so guarantee it ourselves for session windows. */
static void
mg_win32_ensure_minimizable (GdkWindow *gdk_window)
{
HWND hwnd;
LONG_PTR window_style;
if (!gdk_window)
return;
hwnd = gdk_win32_window_get_handle (gdk_window);
if (!hwnd)
return;
window_style = GetWindowLongPtr (hwnd, GWL_STYLE);
if (!window_style || (window_style & WS_MINIMIZEBOX))
return;
SetWindowLongPtr (hwnd, GWL_STYLE, window_style | WS_MINIMIZEBOX);
SetWindowPos (hwnd, NULL, 0, 0, 0, 0,
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
}
static void
mg_win32_allow_autohide_taskbar (GtkWindow *window, GdkEventWindowState *event)
{
@@ -3388,10 +3416,19 @@ mg_topicbar_update_height (GtkWidget *topic)
if (parent && GTK_IS_SCROLLED_WINDOW (parent))
{
gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (parent), -1);
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (parent), -1);
gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (parent), target_height);
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (parent), target_height);
GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW (parent);
int max_height = gtk_scrolled_window_get_max_content_height (scrolled);
if (max_height != -1 && target_height > max_height)
{
gtk_scrolled_window_set_max_content_height (scrolled, target_height);
gtk_scrolled_window_set_min_content_height (scrolled, target_height);
}
else
{
gtk_scrolled_window_set_min_content_height (scrolled, target_height);
gtk_scrolled_window_set_max_content_height (scrolled, target_height);
}
gtk_widget_set_size_request (parent, -1, target_height);
}
}
@@ -4976,6 +5013,7 @@ mg_create_topwindow (session *sess)
#ifdef G_OS_WIN32
parent_win = gtk_widget_get_window (win);
gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
mg_win32_ensure_minimizable (parent_win);
#endif
}
@@ -5012,6 +5050,18 @@ mg_win32_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
if (!msg)
return GDK_FILTER_CONTINUE;
if (msg->message == WM_STYLECHANGING && msg->wParam == (WPARAM)GWL_STYLE)
{
STYLESTRUCT *style = (STYLESTRUCT *)msg->lParam;
/* Keep the window minimizable from its taskbar button; see
* mg_win32_ensure_minimizable (). */
if (style)
style->styleNew |= WS_MINIMIZEBOX;
return GDK_FILTER_CONTINUE;
}
if (msg->message == WM_TIMECHANGE)
{
_tzset();
@@ -5161,6 +5211,7 @@ mg_create_tabwindow (session *sess)
#ifdef G_OS_WIN32
parent_win = gtk_widget_get_window (win);
gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
mg_win32_ensure_minimizable (parent_win);
#endif
}

View File

@@ -138,7 +138,6 @@ struct mymenu
#define XCMENU_MARKUP 2
#define XCMENU_MNEMONIC 4
/* execute a userlistbutton/popupmenu command */
static void
nick_command (session * sess, char *cmd)
@@ -149,7 +148,6 @@ nick_command (session * sess, char *cmd)
handle_command (sess, cmd, TRUE);
}
/* fill in the %a %s %n etc and execute the command */
void
nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
@@ -178,7 +176,6 @@ nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
}
}
/* this can't overflow, since popup->cmd is only 256 */
len = strlen (cmd) + strlen (nick) + strlen (allnick) + 512;
buf = g_malloc (len);
@@ -191,7 +188,6 @@ nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
g_free (buf);
}
/* userlist button has been clicked */
void
userlist_button_cb (GtkWidget * button, char *cmd)
@@ -208,7 +204,6 @@ userlist_button_cb (GtkWidget * button, char *cmd)
if (sess->type == SESS_DIALOG)
{
/* fake a selection */
nicks = g_new (char *, 2);
nicks[0] = g_strdup (sess->channel);
nicks[1] = NULL;
@@ -216,7 +211,6 @@ userlist_button_cb (GtkWidget * button, char *cmd)
}
else
{
/* find number of selected rows */
nicks = userlist_selection_list (sess->gui->user_tree, &num_sel);
if (num_sel < 1)
{
@@ -227,7 +221,6 @@ userlist_button_cb (GtkWidget * button, char *cmd)
}
}
/* create "allnicks" string */
allnicks = g_malloc (((NICKLEN + 1) * num_sel) + 1);
*allnicks = 0;
@@ -241,7 +234,6 @@ userlist_button_cb (GtkWidget * button, char *cmd)
if (!nick)
nick = nicks[0];
/* if not using "%a", execute the command once for each nickname */
if (!using_allnicks)
nick_command_parse (sess, cmd, nicks[i], "");
@@ -265,19 +257,16 @@ userlist_button_cb (GtkWidget * button, char *cmd)
g_free (allnicks);
}
/* a popup-menu-item has been selected */
static void
popup_menu_cb (GtkWidget * item, char *cmd)
{
char *nick;
/* the userdata is set in menu_quick_item() */
nick = g_object_get_data (G_OBJECT (item), "u");
if (!nick) /* userlist popup menu */
{
/* treat it just like a userlist button */
userlist_button_cb (NULL, cmd);
return;
}
@@ -389,7 +378,6 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
if (!name)
return menu;
/* Code to add a submenu */
sub_menu = menu_new ();
if (flags & XCMENU_MARKUP)
{
@@ -411,7 +399,6 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
*sub_item_ret = sub_item;
if (flags & XCMENU_DOLIST)
/* We create a new element in the list */
submenu_list = g_slist_prepend (submenu_list, sub_menu);
return sub_menu;
}
@@ -419,7 +406,6 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
static GtkWidget *
menu_quick_endsub (void)
{
/* Just delete the first element in the linked list pointed to by first */
if (submenu_list)
submenu_list = g_slist_remove (submenu_list, submenu_list->data);
@@ -450,10 +436,7 @@ is_in_path (char *cmd)
char **argv;
int argc;
/* special-case these default entries. */
/* 123456789012345678 */
if (strncmp (prog, "gnome-terminal -x ", 18) == 0)
/* don't check for gnome-terminal, but the thing it's executing! */
prog += 18;
if (g_shell_parse_argv (prog, &argc, &argv, NULL))
@@ -472,7 +455,6 @@ is_in_path (char *cmd)
return 0;
}
/* syntax: "LABEL~ICON~STUFF~ADDED~LATER~" */
static void
menu_extract_icon (char *name, char **label, char **icon)
@@ -485,7 +467,6 @@ menu_extract_icon (char *name, char **label, char **icon)
{
if (*p == '~')
{
/* escape \~ */
if (p == name || p[-1] != '\\')
{
if (!start)
@@ -512,7 +493,6 @@ menu_extract_icon (char *name, char **label, char **icon)
}
}
/* append items to "menu" using the (struct popup*) list provided */
void
menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
@@ -539,14 +519,12 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
} else if (!g_ascii_strncasecmp (pop->name, "ENDSUB", 6))
{
/* empty sub menu due to no programs in PATH? */
if (check_path && childcount < 1)
gtk_widget_destroy (subitem);
subitem = NULL;
if (tempmenu != menu)
tempmenu = menu_quick_endsub ();
/* If we get here and tempmenu equals menu that means we havent got any submenus to exit from */
} else if (!g_ascii_strncasecmp (pop->name, "SEP", 3))
{
@@ -556,10 +534,8 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
{
char *icon, *label;
/* default command in zoitechat.c */
if (pop->cmd[0] == 'n' && !strcmp (pop->cmd, "notify -n ASK %s"))
{
/* don't create this item if already in notify list */
if (!target || notify_is_in_list (current_sess->server, target))
{
list = list->next;
@@ -572,7 +548,6 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
if (!check_path || pop->cmd[0] != '!')
{
menu_quick_item (pop->cmd, label, tempmenu, 0, target, icon);
/* check if the program is in path, if not, leave it out! */
} else if (is_in_path (pop->cmd))
{
childcount++;
@@ -586,7 +561,6 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
list = list->next;
}
/* Let's clean up the linked list from mem */
while (submenu_list)
submenu_list = g_slist_remove (submenu_list, submenu_list->data);
}
@@ -640,10 +614,8 @@ menu_nickinfo_cb (GtkWidget *menu, session *sess)
if (!is_session (sess))
return;
/* issue a /WHOIS */
g_snprintf (buf, sizeof (buf), "WHOIS %s %s", str_copy, str_copy);
handle_command (sess, buf, FALSE);
/* and hide the output */
sess->server->skip_next_whois = 1;
}
@@ -653,7 +625,6 @@ copy_to_clipboard_cb (GtkWidget *item, char *url)
gtkutil_copy_to_clipboard (item, NULL, url);
}
/* returns boolean: Some data is missing */
static gboolean
menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
@@ -665,7 +636,6 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
gboolean missing = FALSE;
GtkWidget *item;
/* let the translators tweak this if need be */
fmt = _("<tt><b>%-11s</b></tt> %s");
g_snprintf (unknown, sizeof (unknown), "<i>%s</i>", _("Unknown"));
@@ -756,14 +726,11 @@ fe_userlist_update (session *sess, struct User *user)
if (!nick_submenu || !str_copy)
return;
/* not the same nick as the menu? */
if (sess->server->p_cmp (user->nick, str_copy))
return;
/* get rid of the "show" signal */
g_signal_handlers_disconnect_by_func (nick_submenu, menu_nickinfo_cb, sess);
/* destroy all the old items */
items = gtk_container_get_children (GTK_CONTAINER (nick_submenu));
iter = items;
while (iter)
@@ -774,7 +741,6 @@ fe_userlist_update (session *sess, struct User *user)
}
g_list_free (items);
/* and re-create them with new info */
needs_refresh = menu_create_nickinfo_menu (user, nick_submenu) ||
!user->hostname || !user->realname || !user->servername;
@@ -816,7 +782,6 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
submenu_list = 0; /* first time through, might not be 0 */
/* more than 1 nick selected? */
if (num_sel > 1)
{
g_snprintf (buf, sizeof (buf), _("%d nicks selected."), num_sel);
@@ -861,7 +826,6 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
menu_popup (menu, event, NULL);
}
/* stuff for the View menu */
static void
menu_showhide_cb (session *sess)
@@ -1025,7 +989,6 @@ menu_fullscreen_toggle (GtkWidget *wid, gpointer ud)
#ifdef WIN32
if (!prefs.hex_gui_win_state) /* not maximized */
{
/* other window managers seem to handle this */
gtk_window_resize (GTK_WINDOW (parent_window),
prefs.hex_gui_win_width, prefs.hex_gui_win_height);
gtk_window_move (GTK_WINDOW (parent_window),
@@ -1051,7 +1014,6 @@ open_url_cb (GtkWidget *item, char *url)
{
char buf[512];
/* pass this to /URL so it can handle irc:// */
g_snprintf (buf, sizeof (buf), "URL %s", url);
handle_command (current_sess, buf, FALSE);
}
@@ -1066,7 +1028,6 @@ menu_urlmenu (GdkEventButton *event, char *url)
str_copy = g_strdup (url);
menu = menu_new ();
/* more than 51 chars? Chop it */
if (g_utf8_strlen (str_copy, -1) >= 52)
{
tmp = g_strdup (str_copy);
@@ -1081,14 +1042,12 @@ menu_urlmenu (GdkEventButton *event, char *url)
}
menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0);
/* Two hardcoded entries */
if (strncmp (str_copy, "irc://", 6) == 0 ||
strncmp (str_copy, "ircs://",7) == 0)
menu_quick_item_with_callback (open_url_cb, _("Connect"), menu, str_copy);
else
menu_quick_item_with_callback (open_url_cb, _("Open Link in Browser"), menu, str_copy);
menu_quick_item_with_callback (copy_to_clipboard_cb, _("Copy Selected Link"), menu, str_copy);
/* custom ones from urlhandlers.conf */
menu_create (menu, urlhandler_list, str_copy, TRUE);
menu_add_plugin_items (menu, "\x4$URL", str_copy);
menu_popup (menu, event, NULL);
@@ -1356,7 +1315,6 @@ menu_newserver_tab (GtkWidget * wid, gpointer none)
int oldf = prefs.hex_gui_tab_newtofront;
prefs.hex_gui_tab_chans = 1;
/* force focus if setting is "only requested tabs" */
if (prefs.hex_gui_tab_newtofront == 2)
prefs.hex_gui_tab_newtofront = 1;
new_ircwindow (NULL, NULL, SESS_SERVER, 0);
@@ -1740,10 +1698,67 @@ menu_ctcpguiopen (void)
editlist_gui_open (NULL, NULL, ctcp_list, buf, "ctcpreply", "ctcpreply.conf", ctcp_help);
}
/* Returns the index.html of a locally installed copy of the documentation,
* or NULL if none is available. Callers own the returned string. */
static char *
menu_docs_local_index (void)
{
const char *env_docdir;
char *path;
env_docdir = g_getenv ("ZOITECHAT_DOCDIR");
if (env_docdir && env_docdir[0])
{
path = g_build_filename (env_docdir, "index.html", NULL);
if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
return path;
g_free (path);
}
/* Docs the user placed in the config dir; works on every platform,
* including portable installs and Flatpak (host-readable, unlike /app) */
path = g_build_filename (get_xdir (), "offline-docs", "index.html", NULL);
if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
return path;
g_free (path);
#ifdef WIN32
/* The installer's "Offline Documentation" component; ZOITECHATDOCDIR is
* relative to the install dir on Windows and must not be resolved
* against the CWD, which depends on how the app was launched */
if (!g_path_is_absolute (ZOITECHATDOCDIR))
{
char *install_dir = g_win32_get_package_installation_directory_of_module (NULL);
if (!install_dir)
return NULL;
path = g_build_filename (install_dir, ZOITECHATDOCDIR, "index.html", NULL);
g_free (install_dir);
}
else
path = g_build_filename (ZOITECHATDOCDIR, "index.html", NULL);
#else
path = g_build_filename (ZOITECHATDOCDIR, "index.html", NULL);
#endif
if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
return path;
g_free (path);
return NULL;
}
static void
menu_docs (GtkWidget *wid, gpointer none)
{
fe_open_url ("https://docs.zoitechat.org/en/latest/");
char *local_index = menu_docs_local_index ();
if (local_index)
{
fe_open_url (local_index);
g_free (local_index);
}
else
fe_open_url ("https://docs.zoitechat.org/en/latest/");
}
/*static void
@@ -2252,7 +2267,6 @@ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
return gtk_widget_is_sensitive (widget);
}
/* === STUFF FOR /MENU === */
static GtkMenuItem *
menu_find_item (GtkWidget *menu, char *name)
@@ -2318,7 +2332,6 @@ menu_find_path (GtkWidget *menu, char *path)
char name[128];
int len;
/* grab the next part of the path */
s = strchr (path, '/');
len = s - path;
if (!s)
@@ -2372,7 +2385,6 @@ menu_foreach_gui (menu_entry *me, void (*callback) (GtkWidget *, menu_entry *, c
list = list->next;
continue;
}
/* do it only once for tab sessions, since they share a GUI */
if (!sess->gui->is_tab || !tabdone)
{
callback (sess->gui->menu, me, NULL);
@@ -2392,13 +2404,11 @@ menu_update_cb (GtkWidget *menu, menu_entry *me, char *target)
if (item)
{
gtk_widget_set_sensitive (item, me->enable);
/* must do it without triggering the callback */
if (GTK_IS_CHECK_MENU_ITEM (item))
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), me->state);
}
}
/* radio state changed via mouse click */
static void
menu_radio_cb (GtkCheckMenuItem *item, menu_entry *me)
{
@@ -2406,15 +2416,12 @@ menu_radio_cb (GtkCheckMenuItem *item, menu_entry *me)
if (gtk_check_menu_item_get_active (item))
me->state = 1;
/* update the state, incase this was changed via right-click. */
/* This will update all other windows and menu bars */
menu_foreach_gui (me, menu_update_cb);
if (me->state && me->cmd)
handle_command (current_sess, me->cmd, FALSE);
}
/* toggle state changed via mouse click */
static void
menu_toggle_cb (GtkCheckMenuItem *item, menu_entry *me)
{
@@ -2422,8 +2429,6 @@ menu_toggle_cb (GtkCheckMenuItem *item, menu_entry *me)
if (gtk_check_menu_item_get_active (item))
me->state = 1;
/* update the state, incase this was changed via right-click. */
/* This will update all other windows and menu bars */
menu_foreach_gui (me, menu_update_cb);
if (me->state)
@@ -2594,7 +2599,6 @@ fe_menu_add (menu_entry *me)
if (!pango_parse_markup (me->label, -1, 0, NULL, &text, NULL, NULL))
return NULL;
/* return the label with markup stripped */
return text;
}
@@ -2610,7 +2614,6 @@ fe_menu_update (menu_entry *me)
menu_foreach_gui (me, menu_update_cb);
}
/* used to add custom menus to the right-click menu */
static void
menu_add_plugin_mainmenu_items (GtkWidget *menu)
@@ -2644,7 +2647,6 @@ menu_add_plugin_items (GtkWidget *menu, char *root, char *target)
}
}
/* === END STUFF FOR /MENU === */
GtkWidget *
menu_create_main (void *accel_group, int bar, int away, int toplevel,
@@ -2677,13 +2679,11 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
else
menu_bar = menu_new ();
/* /MENU needs to know this later */
g_object_set_data (G_OBJECT (menu_bar), "accel", accel_group);
g_signal_connect (G_OBJECT (menu_bar), "can-activate-accel",
G_CALLBACK (menu_canacaccel), 0);
/* set the initial state of toggles */
mymenu[MENUBAR_OFFSET].state = !prefs.hex_gui_hide_menu;
mymenu[MENUBAR_OFFSET+1].state = prefs.hex_gui_topicbar;
mymenu[MENUBAR_OFFSET+2].state = !prefs.hex_gui_ulist_hide;
@@ -2722,7 +2722,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
mymenu[METRE_OFFSET+3].state = 1;
}
/* change Close binding to ctrl-shift-w when using emacs keys */
settings = gtk_widget_get_settings (menu_bar);
if (settings)
{
@@ -2738,7 +2737,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
}
}
/* Away binding to ctrl-alt-a if the _Help menu conflicts (FR/PT/IT) */
{
char *help = _("_Help");
char *under = strchr (help, '_');
@@ -2775,7 +2773,6 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
if (mymenu[i].id == MENU_ID_USERMENU)
usermenu = menu;
menu_item = gtk_menu_item_new_with_mnemonic (_(mymenu[i].text));
/* record the English name for /menu */
g_object_set_data (G_OBJECT (menu_item), "name", mymenu[i].text);
#ifdef HAVE_GTK_MAC /* Added to app menu, see below */
if (!bar || mymenu[i].id != MENU_ID_ZOITECHAT)
@@ -2827,7 +2824,6 @@ normalitem:
togitem:
g_object_set_data (G_OBJECT (item), "zc-key-action", (gpointer) menu_get_key_action_name (i));
menu_add_keybinding_accel (item, accel_group, menu_get_key_action_name (i));
/* must avoid callback for Radio buttons */
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), mymenu[i].state);
/*gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
mymenu[i].state);*/
@@ -2867,7 +2863,6 @@ togitem:
group = NULL;
submenu = menu_new ();
item = create_icon_menu (_(mymenu[i].text), mymenu[i].image, TRUE);
/* record the English name for /menu */
g_object_set_data (G_OBJECT (item), "name", mymenu[i].text);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -2889,13 +2884,10 @@ togitem:
submenu = NULL;
}
/* record this GtkWidget * so it's state might be changed later */
if (mymenu[i].id != 0 && menu_widgets)
/* this ends up in sess->gui->menu_item[MENU_ID_XXX] */
menu_widgets[mymenu[i].id] = item;
#ifdef HAVE_GTK_MAC
/* We want ZoiteChat to be the app menu, not including Quit or ZoiteChat itself */
if (bar && item && i <= CLOSE_OFFSET + 1 && mymenu[i].id != MENU_ID_ZOITECHAT)
{
if (!submenu || mymenu[i].type == M_MENUSUB)

View File

@@ -50,7 +50,7 @@ zoitechat_gtk_deps = [
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
zoitechat_theme_deps = [gtk_dep]
zoitechat_theme_deps = [gtk_dep, zoitechat_common_dep]
if host_machine.system() != 'windows'
appindicator_opt = get_option('appindicator')

View File

@@ -70,6 +70,15 @@ load_text_events (void)
{
}
char **
text_color_event_names (int color, int *count)
{
(void)color;
if (count)
*count = 0;
return NULL;
}
gboolean
theme_get_color (ThemeSemanticToken token, GdkRGBA *color)
{

View File

@@ -52,14 +52,13 @@ static const guint8 theme_default_99_mirc_colors[THEME_XTEXT_MIRC_COLS][3] = {
};
static void
theme_access_apply_default_99_palette (XTextColor *palette, size_t palette_len, gboolean apply_base)
theme_access_apply_default_99_palette (XTextColor *palette, size_t palette_len)
{
size_t i;
size_t start = apply_base ? 0 : 32;
if (palette_len == 0)
return;
for (i = start; i < THEME_XTEXT_MIRC_COLS && i < palette_len; i++)
for (i = 32; i < THEME_XTEXT_MIRC_COLS && i < palette_len; i++)
{
palette[i].red = theme_default_99_mirc_colors[i][0] / 255.0;
palette[i].green = theme_default_99_mirc_colors[i][1] / 255.0;
@@ -148,11 +147,10 @@ gboolean
theme_get_mirc_color (unsigned int mirc_index, GdkRGBA *out_rgba)
{
ThemeSemanticToken token = (ThemeSemanticToken) (THEME_TOKEN_MIRC_0 + (int) mirc_index);
gboolean has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
if (mirc_index >= THEME_XTEXT_MIRC_COLS)
return FALSE;
if (!has_user_colors || mirc_index >= 32)
if (mirc_index >= 32)
{
out_rgba->red = theme_default_99_mirc_colors[mirc_index][0] / 255.0;
out_rgba->green = theme_default_99_mirc_colors[mirc_index][1] / 255.0;
@@ -173,11 +171,10 @@ gboolean
theme_get_mirc_color_rgb16 (unsigned int mirc_index, guint16 *red, guint16 *green, guint16 *blue)
{
ThemeSemanticToken token = (ThemeSemanticToken) (THEME_TOKEN_MIRC_0 + (int) mirc_index);
gboolean has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
if (mirc_index >= THEME_XTEXT_MIRC_COLS)
return FALSE;
if (!has_user_colors || mirc_index >= 32)
if (mirc_index >= 32)
{
*red = (guint16) (theme_default_99_mirc_colors[mirc_index][0] * 257);
*green = (guint16) (theme_default_99_mirc_colors[mirc_index][1] * 257);
@@ -227,7 +224,6 @@ void
theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_t palette_len)
{
ThemeWidgetStyleValues style_values;
gboolean has_user_colors;
GdkRGBA marker_color;
if (!palette)
@@ -235,9 +231,8 @@ theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_
theme_get_widget_style_values_for_widget (widget, &style_values);
theme_runtime_get_xtext_colors (palette, palette_len);
has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
if (palette_len >= THEME_XTEXT_MIRC_COLS)
theme_access_apply_default_99_palette (palette, palette_len, !has_user_colors);
theme_access_apply_default_99_palette (palette, palette_len);
if (palette_len > THEME_XTEXT_MARK_FG_INDEX)
{
palette[THEME_XTEXT_MARK_FG_INDEX].red = style_values.selection_foreground.red;

View File

@@ -38,6 +38,7 @@
#include "theme-runtime.h"
extern void load_text_events (void);
extern char **text_color_event_names (int color, int *count);
typedef struct
{
@@ -243,6 +244,9 @@ theme_preferences_stage_discard (void)
static void
theme_preferences_show_import_error (GtkWidget *button, const char *message);
static void
theme_preferences_color_set_tooltip (GtkWidget *widget, ThemeSemanticToken token);
static void
theme_preferences_manager_row_free (gpointer data)
{
@@ -481,6 +485,7 @@ theme_preferences_color_response_cb (GtkDialog *dialog, gint response_id, gpoint
data->color_change_flag,
TRUE);
theme_preferences_color_button_apply (data->button, &rgba);
theme_preferences_color_set_tooltip (data->button, data->token);
theme_preferences_manager_update_preview ((theme_color_manager_ui *) data->manager_ui);
}
@@ -559,6 +564,113 @@ theme_preferences_token_display_name (ThemeSemanticToken token)
}
}
static char *
theme_preferences_color_tooltip_markup (ThemeSemanticToken token)
{
GString *tip;
GdkRGBA rgba;
char *display;
char *hex;
char *escaped;
char **names;
int count = 0;
if (token < THEME_TOKEN_MIRC_0 || token > THEME_TOKEN_MIRC_31)
return NULL;
if (!theme_preferences_staged_get_color (token, &rgba))
return NULL;
tip = g_string_new (NULL);
display = theme_preferences_token_display_name (token);
hex = theme_preferences_format_hex (&rgba);
escaped = g_markup_escape_text (display, -1);
g_string_append_printf (tip,
"<span background='%s'>\xe2\x80\x83\xe2\x80\x83</span> <b>%s</b> <tt><small>%s</small></tt>",
hex, escaped, hex);
g_free (escaped);
g_free (display);
names = text_color_event_names (token - THEME_TOKEN_MIRC_0, &count);
if (names)
{
int line_target;
int line_len = 0;
int i;
display = g_strdup_printf (ngettext ("Used by %d text event",
"Used by %d text events", count), count);
escaped = g_markup_escape_text (display, -1);
g_string_append_printf (tip,
"\n<small><span alpha='60%%'>%s</span></small>\n\n<small>",
escaped);
g_free (escaped);
g_free (display);
/* Explicit line breaks keep the tooltip geometry stable;
* heavily-used colors get wider lines so the full list
* stays on screen. */
if (count <= 12)
line_target = 44;
else if (count <= 40)
line_target = 60;
else
line_target = 76;
for (i = 0; i < count; i++)
{
int name_len = (int) g_utf8_strlen (names[i], -1);
if (i)
{
if (line_len + name_len + 5 > line_target)
{
g_string_append_c (tip, '\n');
line_len = 0;
}
else
{
g_string_append (tip, " \xc2\xb7 ");
line_len += 5;
}
}
escaped = g_markup_escape_text (names[i], -1);
g_string_append (tip, escaped);
line_len += name_len;
g_free (escaped);
}
g_string_append (tip, "</small>");
g_strfreev (names);
}
else
{
escaped = g_markup_escape_text (_("Not used by any text events"), -1);
g_string_append_printf (tip,
"\n<small><span alpha='60%%'><i>%s</i></span></small>",
escaped);
g_free (escaped);
}
g_free (hex);
return g_string_free (tip, FALSE);
}
/* Static markup tooltips only: building tooltip widgets from a
* query-tooltip handler makes GtkTooltip flicker on some setups, so the
* markup is set once and refreshed whenever the color changes. */
static void
theme_preferences_color_set_tooltip (GtkWidget *widget, ThemeSemanticToken token)
{
char *markup = theme_preferences_color_tooltip_markup (token);
if (!markup)
return;
gtk_widget_set_tooltip_markup (widget, markup);
g_free (markup);
}
static void
theme_preferences_manager_row_apply (theme_color_manager_row *row, const GdkRGBA *rgba)
{
@@ -569,6 +681,7 @@ theme_preferences_manager_row_apply (theme_color_manager_row *row, const GdkRGBA
hex = theme_preferences_format_hex (rgba);
gtk_entry_set_text (GTK_ENTRY (row->entry), hex);
g_free (hex);
theme_preferences_color_set_tooltip (row->row, row->token);
}
static void
@@ -884,6 +997,8 @@ theme_preferences_create_color_manager_dialog (GtkWindow *parent, gboolean *colo
if (theme_preferences_staged_get_color (token, &rgba))
theme_preferences_manager_row_apply (row, &rgba);
theme_preferences_color_set_tooltip (list_row, token);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (theme_preferences_manager_pick_cb), row);
g_object_set_data (G_OBJECT (button), "zoitechat-theme-color-manager-ui", ui);
@@ -1198,6 +1313,7 @@ theme_preferences_create_color_button (GtkWidget *table,
g_object_set_data (G_OBJECT (but), "zoitechat-color-box", box);
g_object_set_data (G_OBJECT (but), "zoitechat-theme-token", GINT_TO_POINTER (token));
g_object_set_data (G_OBJECT (but), "zoitechat-theme-color-change", color_change_flag);
theme_preferences_color_set_tooltip (but, token);
gtk_grid_attach (GTK_GRID (table), but, col, row, 1, 1);
g_signal_connect (G_OBJECT (but), "clicked", G_CALLBACK (theme_preferences_color_cb), parent);
if (theme_preferences_staged_get_color (token, &color))

View File

@@ -286,10 +286,12 @@ xtext_adj_get_page_increment (GtkAdjustment *adj)
static void
xtext_adjustment_apply (GtkAdjustment *adj, gdouble lower, gdouble upper, gdouble value, gdouble page_size)
{
gtk_adjustment_set_lower (adj, lower);
gtk_adjustment_set_upper (adj, upper);
gtk_adjustment_set_page_size (adj, page_size);
gtk_adjustment_set_value (adj, value);
gdouble step_increment = page_size * prefs.hex_gui_mouse_scroll_speed / 100.0;
if (step_increment < 1)
step_increment = 1;
gtk_adjustment_configure (adj, value, lower, upper, step_increment, page_size, page_size);
}
static inline void

View File

@@ -9,6 +9,7 @@
#define PACKAGE_VERSION "<#= [string]::Join('.', $versionParts) #>"
#define ZOITECHATLIBDIR ".\\plugins"
#define ZOITECHATSHAREDIR "."
#define ZOITECHATDOCDIR "offline-docs"
#define OLD_PERL
#define GETTEXT_PACKAGE "zoitechat"
#define PACKAGE_TARNAME "zoitechat-<#= [string]::Join('.', $versionParts) #>"

View File

@@ -66,6 +66,7 @@
<None Include="$(DepsRoot)\bin\*zlib*.dll" />
<None Include="$(DepsRoot)\bin\*girepository*.dll" Condition="'$(LuaEnabled)'=='true' and '$(LuaLibDir)'!=''" />
<None Include="$(Python3Path)\Lib\site-packages\_cffi_backend.*.pyd" Condition="'$(Python3Enabled)'=='true'" />
<None Include="$(Python38Path)\Lib\site-packages\_cffi_backend.*.pyd" Condition="'$(Python38Enabled)'=='true'" />
<LuaLib Include="$(LuaLibDir)\**\*.dll" Condition="'$(LuaEnabled)'=='true' and '$(LuaLibDir)'!=''" />
<LuaShare Include="$(LuaShareDir)\*.lua" Condition="'$(LuaEnabled)'=='true' and '$(LuaShareDir)'!=''" />
@@ -105,10 +106,10 @@
<Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(ZoiteChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(ZoiteChatRel)\lib\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(ZoiteChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />
<Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
<Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
<WriteLinesToFile File="$(ZoiteChatRel)portable-mode" Lines="2" Overwrite="true" />

View File

@@ -16,7 +16,7 @@ AppUpdatesURL=http://zoitechat.org/downloads.html
LicenseFile=share\doc\zoitechat\COPYING
UninstallDisplayIcon={app}\zoitechat.exe
UninstallDisplayName=ZoiteChat
DefaultDirName={pf64}\ZoiteChat
DefaultDirName={commonpf64}\ZoiteChat
DisableDirPage=no
DefaultGroupName=ZoiteChat
AllowNoIcons=yes
@@ -28,11 +28,11 @@ OutputBaseFilename={#APPNAM}-{#APPVER}_x64
FlatComponentsList=no
PrivilegesRequired=none
ShowComponentSizes=no
CreateUninstallRegKey=not IsTaskSelected('portable')
Uninstallable=not IsTaskSelected('portable')
CreateUninstallRegKey=not WizardIsTaskSelected('portable')
Uninstallable=not WizardIsTaskSelected('portable')
ArchitecturesAllowed=x64compatible
ArchitecturesInstallIn64BitMode=x64compatible
MinVersion=6.1
MinVersion=6.1sp1
WizardImageFile={#PROJECTDIR}wizardimage.bmp
WizardSmallImageFile={#PROJECTDIR}wizardsmallimage.bmp
SetupIconFile={#PROJECTDIR}..\..\data\icons\zoitechat.ico
@@ -49,6 +49,7 @@ Name: "icons"; Description: "Create Shortcuts"; Types: custom; Flags: disablenou
Name: "icons\desktopicon"; Description: "Create Desktop Shortcut"; Types: custom; Flags: disablenouninstallwarning
Name: "icons\quicklaunchicon"; Description: "Create Quick Launch Shortcut"; Types: custom; Flags: disablenouninstallwarning
Name: "translations"; Description: "Translations"; Types: normal custom; Flags: disablenouninstallwarning
Name: "docs"; Description: "Offline Documentation"; Types: normal custom; Flags: disablenouninstallwarning
Name: "spell"; Description: "Spelling Dictionaries"; Types: custom; Flags: disablenouninstallwarning
Name: "plugins"; Description: "Plugins"; Types: custom; Flags: disablenouninstallwarning
Name: "plugins\checksum"; Description: "Checksum"; Types: custom; Flags: disablenouninstallwarning
@@ -59,7 +60,7 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags:
Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\lua"; Description: "Lua (LuaJIT 2.1)"; Types: normal custom; Flags: disablenouninstallwarning
Name: "langs\perl"; Description: "Perl (Strawberry Perl 5.42.0.1)"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\python"; Description: "Python (Python 3.14.3)"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\python"; Description: "Python (Python 3.14.3, or 3.8.10 before Windows 10)"; Types: custom; Flags: disablenouninstallwarning
Name: "themes"; Description: "GTK3 Themes"; Types: normal minimal custom; Flags: disablenouninstallwarning
Name: "themes\windows10"; Description: "Windows 10"; Types: normal minimal custom; Flags: disablenouninstallwarning
Name: "themes\windows10dark"; Description: "Windows 10 Dark"; Types: normal minimal custom; Flags: disablenouninstallwarning
@@ -109,6 +110,9 @@ Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; F
Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
Source: "share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
; Staged at build time by data\misc\build_offline_docs.py; absent when the
; docs could not be built, in which case Help->Contents opens the website
Source: "offline-docs\*"; DestDir: "{app}\offline-docs"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: docs
Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "atk-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -181,7 +185,8 @@ Source: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
Source: "python\*.py"; DestDir: "{app}\python"; Flags: ignoreversion; Components: langs\python
Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python
Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python; Check: not NeedsLegacyPython
Source: "plugins\hcpython38.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion skipifsourcedoesntexist; Components: langs\python; Check: NeedsLegacyPython
Source: "_cffi_backend.cp3*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\python
Source: "zoitechat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -328,6 +333,32 @@ begin
Result := DirExists(ExpandConstant('{localappdata}') + '\enchant\myspell');
end;
// Python >= 3.9 dropped support for Windows versions before 10;
// those systems get Python 3.8 and the matching plugin instead.
function NeedsLegacyPython(): Boolean;
var
Version: TWindowsVersion;
begin
GetWindowsVersionEx(Version);
Result := Version.NTPlatform and (Version.Major < 10);
end;
function PythonURL(): String;
begin
if NeedsLegacyPython() then
Result := 'https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe'
else
Result := 'https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe';
end;
function PythonDLL(): String;
begin
if NeedsLegacyPython() then
Result := 'python38.dll'
else
Result := 'python314.dll';
end;
/////////////////////////////////////////////////////////////////////
// Sets up the automatic downloads
/////////////////////////////////////////////////////////////////////
@@ -345,34 +376,34 @@ begin
begin
idpClearFiles;
if IsComponentSelected('themes\windows10') then
if WizardIsComponentSelected('themes\windows10') then
idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
if IsComponentSelected('themes\windows10dark') then
if WizardIsComponentSelected('themes\windows10dark') then
idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
if not IsTaskSelected('portable') then
if not WizardIsTaskSelected('portable') then
begin
REDIST := 'https://aka.ms/vs/17/release/vc_redist.x64.exe';
PERL := 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54201_64bit/strawberry-perl-5.42.0.1-64bit.msi';
PY3 := 'https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe';
SPELL := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/ZoiteChat.Spelling.Dictionaries.r2.exe';
PY3 := PythonURL();
SPELL := 'https://github.com/hexchat/gvsbuild/releases/download/hexchat-2.16.2/HexChat.Spelling.Dictionaries.r2.exe';
if IsComponentSelected('deps\vcredist2015') and not CheckVCInstall() then
if WizardIsComponentSelected('deps\vcredist2015') and not CheckVCInstall() then
idpAddFile(REDIST, ExpandConstant('{tmp}\vcredist.exe'));
if IsComponentSelected('spell') and not CheckSpellInstall() then
if WizardIsComponentSelected('spell') and not CheckSpellInstall() then
idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe'));
if not WizardSilent() then
begin
if IsComponentSelected('langs\perl') and not CheckDLL('perl542.dll') then
if WizardIsComponentSelected('langs\perl') and not CheckDLL('perl542.dll') then
begin
idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi'))
end;
if IsComponentSelected('langs\python') and not CheckDLL('python314.dll') then
if WizardIsComponentSelected('langs\python') and not CheckDLL(PythonDLL()) then
idpAddFile(PY3, ExpandConstant('{tmp}\python.exe'));
end;
end;
@@ -397,7 +428,7 @@ begin
if (CurPageID = wpSelectTasks) then
if (WizardForm.TasksList.Checked[1] = True) then
if (WizardDirValue() = ExpandConstant('{pf64}\ZoiteChat')) then
if (WizardDirValue() = ExpandConstant('{commonpf64}\ZoiteChat')) then
begin
WizardForm.TasksList.Checked[1] := False
MsgBox('Portable mode is only intended for use on portable drives and has been disabled.', mbInformation, MB_OK)
@@ -405,21 +436,21 @@ begin
if CurPageID = wpReady then
begin
if IsComponentSelected('themes\windows10') and not FileExists(ExpandConstant('{tmp}\Windows-10-3.2.1.zip')) then
if WizardIsComponentSelected('themes\windows10') and not FileExists(ExpandConstant('{tmp}\Windows-10-3.2.1.zip')) then
begin
MsgBox('Windows 10 GTK3 theme could not be downloaded. Please retry setup and rerun setup.', mbError, MB_OK);
Result := False;
Exit;
end;
if IsComponentSelected('themes\windows10dark') and not FileExists(ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip')) then
if WizardIsComponentSelected('themes\windows10dark') and not FileExists(ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip')) then
begin
MsgBox('Windows 10 Dark GTK3 theme could not be downloaded. Please retry setup and rerun setup.', mbError, MB_OK);
Result := False;
Exit;
end;
if IsComponentSelected('deps\vcredist2015') and not CheckVCInstall() and not FileExists(ExpandConstant('{tmp}\vcredist.exe')) then
if WizardIsComponentSelected('deps\vcredist2015') and not CheckVCInstall() and not FileExists(ExpandConstant('{tmp}\vcredist.exe')) then
begin
MsgBox('Visual C++ Redistributable could not be downloaded. Please retry setup or install it manually and rerun setup.', mbError, MB_OK);
Result := False;
@@ -486,7 +517,7 @@ end;
/////////////////////////////////////////////////////////////////////
procedure CurStepChanged(CurStep: TSetupStep);
begin
if not (IsTaskSelected('portable')) then
if not (WizardIsTaskSelected('portable')) then
begin
if (CurStep=ssInstall) then
begin

View File

@@ -1 +1 @@
2.18.2
2.18.3

View File

@@ -8,6 +8,7 @@
<YourGendefPath>c:\gtk-build\gendef</YourGendefPath>
<YourPerlPath>c:\gtk-build\perl-5.42.0.1</YourPerlPath>
<YourPython3Path>c:\gtk-build\python-3.14</YourPython3Path>
<YourPython38Path>c:\gtk-build\python-3.8</YourPython38Path>
<YourWinSparklePath>c:\gtk-build\WinSparkle</YourWinSparklePath>
<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->
@@ -32,6 +33,12 @@
<Python3Enabled Condition="Exists('$(Python3Path)\\python.exe') and Exists('$(Python3Path)\\libs\\$(Python3Lib).lib') and Exists('$(Python3Path)\\Lib\\site-packages\\cffi')">true</Python3Enabled>
<Python3Enabled Condition="'$(Python3Enabled)'==''">false</Python3Enabled>
<Python38Path>$(YourPython38Path)\$(ZoiteChatPlatform)</Python38Path>
<Python38Lib>python38</Python38Lib>
<Python38Output>hcpython38</Python38Output>
<Python38Enabled Condition="Exists('$(Python38Path)\\python.exe') and Exists('$(Python38Path)\\libs\\$(Python38Lib).lib') and Exists('$(Python38Path)\\Lib\\site-packages\\cffi')">true</Python38Enabled>
<Python38Enabled Condition="'$(Python38Enabled)'==''">false</Python38Enabled>
<PerlEnabled Condition="Exists('$(PerlPath)\\bin\\perl.exe') and Exists('$(PerlPath)\\bin\\$(PerlLib).dll') and Exists('$(GendefPath)\\gendef.exe')">true</PerlEnabled>
<PerlEnabled Condition="'$(PerlEnabled)'==''">false</PerlEnabled>

View File

@@ -60,6 +60,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}"
ProjectSection(ProjectDependencies) = postProject
{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}
{D58924D2-1492-4AC3-B058-7A214424EEDC} = {D58924D2-1492-4AC3-B058-7A214424EEDC}
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}
{17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}
{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}
@@ -80,6 +81,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl", "..\plugins\perl\per
{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python38", "..\plugins\python\python38.vcxproj", "{D58924D2-1492-4AC3-B058-7A214424EEDC}"
ProjectSection(ProjectDependencies) = postProject
{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3", "..\plugins\python\python3.vcxproj", "{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}"
ProjectSection(ProjectDependencies) = postProject
{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
@@ -127,6 +133,8 @@ Global
{D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|x64.Build.0 = Release|x64
{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.ActiveCfg = Release|x64
{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.Build.0 = Release|x64
{D58924D2-1492-4AC3-B058-7A214424EEDC}.Release|x64.ActiveCfg = Release|x64
{D58924D2-1492-4AC3-B058-7A214424EEDC}.Release|x64.Build.0 = Release|x64
{C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.ActiveCfg = Release|x64
{C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.Build.0 = Release|x64
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.ActiveCfg = Release|x64
@@ -151,6 +159,7 @@ Global
{5A0F4962-E670-4DA2-9E45-52CC47F26E2F} = {0FD996A7-464F-4981-8380-3DCA3A244A13}
{D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
{D58924D2-1492-4AC3-B058-7A214424EEDC} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
{C53145CC-D021-40C9-B97C-0249AB9A43C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D}
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {021EC1D0-FF67-4700-9AB2-EAABF1159C09}
{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}