Skip to content

Various improvements #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
7heo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Various improvements #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b89472
Fix Makefile so it doesn't depend on Bash
7heo Mar 27, 2026
7f04ede
Also allow "Enter" to send messages
7heo Mar 27, 2026
40a57c7
Fix various shell scripts
7heo Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ RM = rm
MKDIR = mkdir
MESON = meson
DBG = gdb
OS ?= $(shell uname -s)

BUILDDIR = builddir
PREFIX = $(PWD)/prefix
Expand Down Expand Up @@ -51,14 +52,14 @@ doc:
xdg-open $(PREFIX)/share/doc/srain/html/index.html

$(BUILDDIR): meson.build | $(PREFIX)
if [[ "$$OSTYPE" == "darwin"* ]]; then \
source ./script/macos-pkgconfig-path.sh; \
fi; \
if [[ "$$OSTYPE" == "linux-gnu"* ]]; then \
$(MESON) setup --prefix=$(PREFIX) --buildtype=debug $@; \
else \
$(MESON) setup --prefix=$(PREFIX) --buildtype=debug -Dapp_indicator=false $@; \
fi
ifeq ($(OS), Darwin)
. ./script/macos-pkgconfig-path.sh
else ifeq ($(OS), Linux)
$(MESON) setup --prefix=$(PREFIX) --buildtype=debug $@
else
$(MESON) setup --prefix=$(PREFIX) --buildtype=debug -Dapp_indicator=false $@; \
endif
endif
Copy link
Copy Markdown
Member

@SilverRainZ SilverRainZ Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two endif?

Copy link
Copy Markdown
Author

@7heo 7heo Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two if, two endif.


$(PREFIX):
$(MKDIR) $@
6 changes: 3 additions & 3 deletions script/gen-build-id.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#

# Check argument
[ -z $1 ] && echo Missing target directory && exit 1
[ -z "$1" ] && echo Missing target directory && exit 1

# Whether a git repo
cd $1 && [ -d .git ] && git rev-parse --git-dir > /dev/null 2>&1 || exit 0
cd "$1" && [ -d .git ] && git rev-parse --git-dir > /dev/null 2>&1 || exit 0

# Generate build ID
echo -n git@0.`git rev-list --count HEAD`.`git describe --always`
printf '%s' "git@0.$(git rev-list --count HEAD).$(git describe --always)"
7 changes: 4 additions & 3 deletions script/macos-pkgconfig-path.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/usr/local/opt/icu4c/lib/pkgconfig"
Comment thread
SilverRainZ marked this conversation as resolved.
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/usr/local/opt/openssl@3/lib/pkgconfig"
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/usr/local/opt/libsoup@2/lib/pkgconfig"
#!/bin/sh
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libsoup@2/lib/pkgconfig"
20 changes: 10 additions & 10 deletions script/rename-g-type.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
Comment thread
SilverRainZ marked this conversation as resolved.
#!/usr/bin/env bash

# Type: GtkWidget
# Variations:
Expand Down Expand Up @@ -28,13 +28,13 @@ old_var=($(gen_var ${OLD_TYPE}))
new_var=($(gen_var ${NEW_TYPE}))

for f in $(find ./src/ \( -name '*.h' -o -name '*.c' \)); do
sed -i "s/\b${old_var[0]}\b/${new_var[0]}/g" ${f} # GtkWidget
sed -i "s/\b${old_var[0]}Class\b/${new_var[0]}Class/g" ${f} # GtkWidgetClass
sed -i "s/\b_${old_var[0]}\b/_${new_var[0]}/g" ${f} # _GtkWidget
sed -i "s/\b_${old_var[0]}Class\b/_${new_var[0]}Class/g" ${f} # _GtkWidgetClass
sed -i "s/\b${old_var[1]}\b/${new_var[1]}/g" ${f} # GTK_TYPE_WIDGET
sed -i "s/\b${old_var[2]}\([0-9a-zA-Z_]*\b\)/${new_var[2]}\1/g" ${f} # GTK_WIDGET[xxx]
sed -i "s/\b${old_var[3]}\b/${new_var[3]}/g" ${f} # gtk_widget
sed -i "s/\b${old_var[3]}\([0-9a-zA-Z_ ]*(\)/${new_var[3]}\1/g" ${f} # gtk_widget[xxx](
sed -i "s/\b${old_var[4]}\b/${new_var[4]}/g" ${f} # GTK_IS_WIDGET
sed -i "s/\b${old_var[0]}\b/${new_var[0]}/g" "${f}" # GtkWidget
sed -i "s/\b${old_var[0]}Class\b/${new_var[0]}Class/g" "${f}" # GtkWidgetClass
sed -i "s/\b_${old_var[0]}\b/_${new_var[0]}/g" "${f}" # _GtkWidget
sed -i "s/\b_${old_var[0]}Class\b/_${new_var[0]}Class/g" "${f}" # _GtkWidgetClass
sed -i "s/\b${old_var[1]}\b/${new_var[1]}/g" "${f}" # GTK_TYPE_WIDGET
sed -i "s/\b${old_var[2]}\([0-9a-zA-Z_]*\b\)/${new_var[2]}\1/g" "${f}" # GTK_WIDGET[xxx]
sed -i "s/\b${old_var[3]}\b/${new_var[3]}/g" "${f}" # gtk_widget
sed -i "s/\b${old_var[3]}\([0-9a-zA-Z_ ]*(\)/${new_var[3]}\1/g" "${f}" # gtk_widget[xxx](
sed -i "s/\b${old_var[4]}\b/${new_var[4]}/g" "${f}" # GTK_IS_WIDGET
done
4 changes: 2 additions & 2 deletions script/srv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env sh
#!/bin/sh

ngircd -n -p -f ngircd.conf
ngircd -n -p -f ngircd.conf
1 change: 1 addition & 0 deletions src/sui/sui_window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ static gboolean input_text_view_on_key_press(GtkTextView *text_view,
break;
}
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
{
if ((self->cfg->send_on_ctrl_enter)
^ (event->state & GDK_CONTROL_MASK )){
Expand Down