mirror of
https://github.com/irssi/irssi.git
synced 2026-08-09 03:40:16 +02:00
Rename irssip to irssi and add configure script
Changed default nick, real_name, user_name, and autolog_path from 'irssip' to 'irssi' in config files. Updated Meson build system to use a configurable package name via new 'pkgname' option. Added an intelligent, interactive 'configure.sh' script for setup and build. Removed obsolete documentation and Perl script files related to 'irssip'.
This commit is contained in:
kofany
parent
25f2b16544
commit
09c23c2d0e
298 changed files with 2131 additions and 2996 deletions
|
|
@ -282,7 +282,7 @@ statusbar = {
|
|||
|
||||
settings = {
|
||||
core = {
|
||||
nick = "irssip_user";
|
||||
nick = "irssi_user";
|
||||
hostname = "0.0.0.0";
|
||||
timestamp_format = "%H:%M:%S";
|
||||
override_coredump_limit = "no";
|
||||
|
|
@ -293,8 +293,8 @@ settings = {
|
|||
recode_fallback = "ISO-8859-2";
|
||||
recode_transliterate = "yes";
|
||||
recode = "yes";
|
||||
real_name = "Irssip User";
|
||||
user_name = "irssip";
|
||||
real_name = "irssi User";
|
||||
user_name = "irssi";
|
||||
};
|
||||
"irc/core" = {
|
||||
lag_check_time = "5s";
|
||||
|
|
@ -309,7 +309,7 @@ settings = {
|
|||
timestamp_level = "ALL";
|
||||
hilight_color = "%M";
|
||||
autolog = "yes";
|
||||
autolog_path = "~/.irssip/logs/$tag/$0.log";
|
||||
autolog_path = "~/.irssi/logs/$tag/$0.log";
|
||||
term_charset = "UTF-8";
|
||||
use_status_window = "no";
|
||||
hilight_nick_matches = "yes";
|
||||
|
|
|
|||
160
configure.sh
Executable file
160
configure.sh
Executable file
|
|
@ -0,0 +1,160 @@
|
|||
#!/bin/sh
|
||||
|
||||
# configure.sh - Inteligentny, przenośny skrypt konfiguracyjny dla irssi-dev
|
||||
|
||||
# --- Funkcje Pomocnicze ---
|
||||
ask_yes_no() {
|
||||
while true; do
|
||||
printf "$1 [y/n]: "
|
||||
read -r answer
|
||||
case "$answer" in
|
||||
[Yy]*) return 0 ;;
|
||||
[Nn]*) return 1 ;;
|
||||
*) printf "Proszę odpowiedzieć 'y' lub 'n'.\n" ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
cleanup_backups() {
|
||||
printf "🧹 Czyszczenie plików tymczasowych (.bak)...
|
||||
"
|
||||
find . -name "*.bak" -type f -delete
|
||||
}
|
||||
|
||||
# --- Krok 1: Wykrywanie OS i ustawianie domyślnych ścieżek ---
|
||||
OS_TYPE=$(uname -s)
|
||||
DEFAULT_SYSTEM_PREFIX="/usr/local"
|
||||
DEFAULT_USER_PREFIX="$HOME/.local"
|
||||
|
||||
# --- Krok 2: Wykrywanie istniejącego irssi ---
|
||||
printf "🔎 Sprawdzanie istniejącej instalacji irssi...\n"
|
||||
EXISTING_IRSSI_BIN=$(command -v irssi)
|
||||
EXISTING_IRSSI_DIR="$HOME/.irssi"
|
||||
TARGET_NAME="irssi"
|
||||
|
||||
if [ -n "$EXISTING_IRSSI_BIN" ] || [ -d "$EXISTING_IRSSI_DIR" ]; then
|
||||
printf "⚠️ Wykryto istniejącą instalację irssi!\n"
|
||||
if [ -n "$EXISTING_IRSSI_BIN" ]; then
|
||||
printf " - Plik binarny znaleziony w: %s\n" "$EXISTING_IRSSI_BIN"
|
||||
fi
|
||||
if [ -d "$EXISTING_IRSSI_DIR" ]; then
|
||||
printf " - Katalog konfiguracyjny znaleziony w: %s\n" "$EXISTING_IRSSI_DIR"
|
||||
fi
|
||||
|
||||
printf "\nMożesz zainstalować tę wersję jako główny program lub obok, pod inną nazwą.\n"
|
||||
printf "1. Zastąp (zainstaluj jako 'irssi')\n"
|
||||
printf "2. Zainstaluj obok (jako 'arssi')\n"
|
||||
|
||||
while true; do
|
||||
printf "Wybierz opcję [1/2]: "
|
||||
read -r choice
|
||||
case "$choice" in
|
||||
1)
|
||||
printf "Wybrano instalację jako 'irssi'.\n"
|
||||
printf "🚨 Pamiętaj, aby ręcznie odinstalować poprzednią wersję za pomocą menedżera pakietów, aby uniknąć konfliktów.\n"
|
||||
if ! ask_yes_no "Kontynuować?"; then printf "Przerwano.\n"; exit 1; fi
|
||||
TARGET_NAME="irssi"
|
||||
break
|
||||
;;
|
||||
2)
|
||||
printf "Wybrano instalację obok pod nazwą 'arssi'.\n"
|
||||
TARGET_NAME="arssi"
|
||||
break
|
||||
;;
|
||||
*)
|
||||
printf "Nieprawidłowy wybór.\n"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
|
||||
# --- Krok 3: Wybór typu instalacji (Systemowa vs. Użytkownika) ---
|
||||
printf "\nWybierz typ instalacji:\n"
|
||||
printf "1. Systemowa (dla wszystkich użytkowników, wymaga sudo, zalecane: %s)\n" "$DEFAULT_SYSTEM_PREFIX"
|
||||
printf "2. Lokalna (tylko dla Ciebie, nie wymaga sudo, zalecane: %s)\n" "$DEFAULT_USER_PREFIX"
|
||||
|
||||
while true; do
|
||||
printf "Wybierz opcję [1/2]: "
|
||||
read -r choice
|
||||
case "$choice" in
|
||||
1)
|
||||
INSTALL_PREFIX="$DEFAULT_SYSTEM_PREFIX"
|
||||
SUDO_NEEDED="tak"
|
||||
break
|
||||
;;
|
||||
2)
|
||||
INSTALL_PREFIX="$DEFAULT_USER_PREFIX"
|
||||
SUDO_NEEDED="nie"
|
||||
break
|
||||
;;
|
||||
*)
|
||||
printf "Nieprawidłowy wybór.\n"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# --- Krok 4: Dynamiczna zmiana nazwy (jeśli to konieczne) ---
|
||||
MESON_OPTS=""
|
||||
if [ "$TARGET_NAME" != "irssi" ]; then
|
||||
printf "\n🔧 Konfiguruj
|
||||
ę projektu do używania nazwy '%s'...
|
||||
" "$TARGET_NAME"
|
||||
MESON_OPTS="-Dpkgname=$TARGET_NAME"
|
||||
|
||||
# Zmiana nazwy binarnej w meson.build
|
||||
sed -i.bak "s/executable('irssi'/executable('$TARGET_NAME'/" src/fe-text/meson.build
|
||||
|
||||
# Zmiana katalogu domowego w common.h
|
||||
sed -i.bak "s|\"%s/.irssi\"|\"%s/.$TARGET_NAME\"|" src/common.h
|
||||
|
||||
# Zmiana ścieżek #include w całym kodzie
|
||||
printf "Aktualizowanie ścieżek #include...
|
||||
"
|
||||
for ext in c h xs; do
|
||||
find src tests -type f -name "*.$ext" -exec sed -i.bak "s|<irssi/|<$TARGET_NAME/|g" {} \;
|
||||
done
|
||||
|
||||
printf "✅ Konfiguracja nazwy zakończona.\n"
|
||||
fi
|
||||
|
||||
# --- Krok 5: Uruchomienie procesu budowania ---
|
||||
BUILD_DIR="$(pwd)/Build"
|
||||
|
||||
printf "\n🛠️ Przygotowywanie do budowania w katalogu: %s\n" "$BUILD_DIR"
|
||||
printf "📦 Prefiks instalacji: %s\n" "$INSTALL_PREFIX"
|
||||
|
||||
if [ -d "$BUILD_DIR" ]; then
|
||||
printf "Usuwanie istniejącego katalogu Build...
|
||||
"
|
||||
rm -rf "$BUILD_DIR"
|
||||
fi
|
||||
|
||||
printf "\n⚙️ Uruchamianie Meson...
|
||||
"
|
||||
if ! meson setup "$BUILD_DIR" -Dprefix="$INSTALL_PREFIX" -Dwith-perl=yes -Dwith-proxy=yes $MESON_OPTS; then
|
||||
printf "❌ Błąd podczas konfiguracji Meson. Sprawdź logi powyżej.\n"
|
||||
cleanup_backups
|
||||
exit 1
|
||||
fi
|
||||
|
||||
printf "\n🔨 Uruchamianie Ninja (kompilacja)...
|
||||
"
|
||||
if ! ninja -C "$BUILD_DIR"; then
|
||||
printf "❌ Błąd podczas kompilacji. Sprawdź logi powyżej.\n"
|
||||
cleanup_backups
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Czyszczenie po udanej kompilacji
|
||||
cleanup_backups
|
||||
|
||||
printf "\n✨ Kompilacja zakończona sukcesem!\n"
|
||||
printf "Aby zainstalować, uruchom następującą komendę:\n"
|
||||
if [ "$SUDO_NEEDED" = "tak" ]; then
|
||||
printf "sudo ninja -C %s install\n" "$BUILD_DIR"
|
||||
else
|
||||
printf "ninja -C %s install\n" "$BUILD_DIR"
|
||||
printf "\nUpewnij się, że katalog '%s/bin' jest dodany do Twojej zmiennej środowiskowej PATH.\n" "$INSTALL_PREFIX"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
@ -242,7 +242,7 @@ statusbar = {
|
|||
|
||||
settings = {
|
||||
core = {
|
||||
nick = "irssip_user";
|
||||
nick = "irssi_user";
|
||||
hostname = "0.0.0.0";
|
||||
timestamp_format = "%H:%M:%S";
|
||||
override_coredump_limit = "no";
|
||||
|
|
@ -253,8 +253,8 @@ settings = {
|
|||
recode_fallback = "ISO-8859-2";
|
||||
recode_transliterate = "yes";
|
||||
recode = "yes";
|
||||
real_name = "Irssip User";
|
||||
user_name = "irssip";
|
||||
real_name = "irssi User";
|
||||
user_name = "irssi";
|
||||
};
|
||||
"irc/core" = {
|
||||
lag_check_time = "5s";
|
||||
|
|
@ -269,7 +269,7 @@ settings = {
|
|||
timestamp_level = "ALL";
|
||||
hilight_color = "%M";
|
||||
autolog = "yes";
|
||||
autolog_path = "~/.irssip/logs/$tag/$0.log";
|
||||
autolog_path = "~/.irssi/logs/$tag/$0.log";
|
||||
term_charset = "UTF-8";
|
||||
use_status_window = "no";
|
||||
hilight_nick_matches = "yes";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ if host_machine.system() == 'android'
|
|||
endif
|
||||
|
||||
includedir = get_option('includedir')
|
||||
incdir = 'irssip'
|
||||
incdir = get_option('pkgname')
|
||||
moduledir = get_option('libdir') / incdir / 'modules'
|
||||
helpdir = get_option('datadir') / incdir / 'help'
|
||||
themedir = get_option('datadir') / incdir / 'themes'
|
||||
|
|
|
|||
|
|
@ -14,3 +14,4 @@ option('install-glib', type : 'combo', description : 'Download and install
|
|||
option('docdir', type : 'string', description : 'Documentation directory')
|
||||
option('fhs-prefix', type : 'string', description : 'System prefix for Termux')
|
||||
option('PACKAGE_VERSION', type : 'string', description : 'Override PACKAGE_VERSION in tarballs')
|
||||
option('pkgname', type: 'string', value: 'irssi', description: 'Name for the package library directory.')
|
||||
86
msg_flow.md
86
msg_flow.md
|
|
@ -1,86 +0,0 @@
|
|||
## ANALIZA KROK PO KROKU - FLOW WIADOMOŚCI W IRSSI
|
||||
|
||||
### 1. WIADOMOŚCI PRZYCHODZĄCE (od serwera do wyświetlenia)
|
||||
|
||||
#### Krok 1: Odbieranie z serwera
|
||||
**Funkcja**: `irc_parse_incoming()` w `src/irc/core/irc.c:543`
|
||||
- Czyta dane z socketu przez `net_sendbuffer_receive_line()`
|
||||
- Emituje sygnał `"server incoming"` z surową linią
|
||||
|
||||
#### Krok 2: Parsowanie IRC
|
||||
**Funkcja**: `irc_parse_incoming_line()` w `src/irc/core/irc.c:528`
|
||||
- Parsuje prefix (nick, address, tags) przez `irc_parse_prefix()`
|
||||
- Emituje sygnał `"server event tags"` z parsowanymi danymi
|
||||
|
||||
#### Krok 3: Rozpoznanie typu wiadomości
|
||||
**Funkcja**: `irc_server_event()` w `src/irc/core/irc.c:370`
|
||||
- Parsuje komendę IRC (PRIVMSG, JOIN, etc.)
|
||||
- Emituje odpowiedni sygnał np. `"event privmsg"`
|
||||
|
||||
#### Krok 4: Konwersja na sygnały wiadomości
|
||||
**Funkcja**: `event_privmsg()` w `src/fe-common/irc/fe-events.c:42`
|
||||
- Dekoduje wiadomość przez `recode_in()`
|
||||
- Rozróżnia kanał vs prywatna
|
||||
- Emituje `"message public"` lub `"message private"`
|
||||
|
||||
#### Krok 5: Obsługa sygnału wiadomości
|
||||
**Funkcja**: `sig_message_public()` w `src/fe-common/core/fe-messages.c:168`
|
||||
- Znajduje kanał i nick record
|
||||
- Pobiera nickmode przez `channel_get_nickmode()`
|
||||
- Sprawdza highlight przez `hilight_match()`
|
||||
- **WYWOŁUJE**: `printformat_module("fe-common/core", server, target, level, TXT_PUBMSG, nick, address, msg, nickmode)`
|
||||
|
||||
### 2. FORMATOWANIE I THEME
|
||||
|
||||
#### Krok 6: printformat_module
|
||||
**Funkcja**: `printformat_module()` w `src/fe-common/core/printtext.c:101`
|
||||
- Tworzy `TEXT_DEST_REC` przez `format_create_dest()`
|
||||
- Wywołuje `printformat_module_dest_args()`
|
||||
|
||||
#### Krok 7: Emisja sygnału formatowania
|
||||
**Funkcja**: `printformat_module_dest_charargs()` w `src/fe-common/core/printtext.c:64`
|
||||
- Pobiera theme przez `window_get_theme()`
|
||||
- **EMITUJE**: `signal_emit_id(signal_print_format, 5, theme, module, dest, formatnum, arglist)`
|
||||
|
||||
#### Krok 8: Obsługa sygnału formatowania
|
||||
**Funkcja**: `sig_print_format()` w `src/fe-common/core/printtext.c:459`
|
||||
- **WYWOŁUJE**: `format_get_text_theme_charargs(theme, module, dest, formatnum, arglist)`
|
||||
|
||||
#### Krok 9: Pobieranie tekstu z theme
|
||||
**Funkcja**: `format_get_text_theme_charargs()` w `src/fe-common/core/formats.c:831`
|
||||
- Znajduje moduł theme w `theme->modules`
|
||||
- Pobiera expanded format: `text = module_theme->expanded_formats[formatnum]`
|
||||
- **WYWOŁUJE**: `format_get_text_args(dest, text, args)`
|
||||
|
||||
#### Krok 10: Parsowanie expandos i zmiennych
|
||||
**Funkcja**: `format_get_text_args()` w `src/fe-common/core/formats.c:737`
|
||||
- Iteruje przez tekst formatujący
|
||||
- Gdy napotka `$`, wywołuje `parse_special()`
|
||||
|
||||
#### Krok 11: Parsowanie expandos
|
||||
**Funkcja**: `parse_special()` w `src/core/special-vars.c:425`
|
||||
- Parsuje składnię `$[alignment]variable`
|
||||
- **WYWOŁUJE**: `get_special_value()` → `get_variable()` → `get_long_variable_value()`
|
||||
|
||||
#### Krok 12: Wykonanie expando
|
||||
**Funkcja**: `get_long_variable_value()` w `src/core/special-vars.c:95`
|
||||
- **WYWOŁUJE**: `func = expando_find_long(key)`
|
||||
- **WYWOŁUJE**: `return func(server, item, free_ret)` ← **TU SĄ NASZE EXPANDOS!**
|
||||
|
||||
### 3. WIADOMOŚCI WYCHODZĄCE (nasze wiadomości)
|
||||
|
||||
#### Krok 1: Input od użytkownika
|
||||
**Funkcja**: Obsługa klawiatury w `src/fe-text/gui-readline.c`
|
||||
- Przechwytuje Enter, wywołuje `signal_emit("send command", ...)`
|
||||
|
||||
#### Krok 2: Parsowanie komendy
|
||||
**Funkcja**: `cmd_msg()` lub podobne w `src/irc/core/irc-commands.c`
|
||||
- Wysyła PRIVMSG do serwera
|
||||
- Emituje `"message own_public"` lub `"message own_private"`
|
||||
|
||||
#### Krok 3: Formatowanie własnej wiadomości
|
||||
**Funkcja**: `sig_message_own_public()` w `src/fe-common/core/fe-messages.c:281`
|
||||
- Pobiera nickmode przez `channel_get_nickmode(channel, server->nick)`
|
||||
- **WYWOŁUJE**: `printformat_module("fe-common/core", server, target, level, TXT_OWN_MSG, server->nick, target, msg, nickmode)`
|
||||
|
||||
**Dalej flow jest identyczny jak dla wiadomości przychodzących od kroku 6.**
|
||||
569
nm2.pl
569
nm2.pl
|
|
@ -1,569 +0,0 @@
|
|||
use Irssi;
|
||||
use strict;
|
||||
use v5.14;
|
||||
use List::Util qw(min max);
|
||||
use Hash::Util qw(lock_keys);
|
||||
|
||||
our $VERSION = '2.1'; # a42b713aaa38823
|
||||
our %IRSSI = (
|
||||
authors => 'Nei',
|
||||
contact => 'Nei @ anti@conference.jabber.teamidiot.de',
|
||||
url => "http://anti.teamidiot.de/",
|
||||
name => 'nm2',
|
||||
description => 'right aligned nicks depending on longest nick',
|
||||
license => 'GPL v2',
|
||||
);
|
||||
|
||||
# based on bc-bd's original nm.pl
|
||||
#
|
||||
# use a ** nickcolor_expando ** script for nick colors!
|
||||
#
|
||||
# why is there no right_mode? you can do that in your theme!
|
||||
|
||||
# Options
|
||||
# =======
|
||||
# /set neat_dynamic <ON|OFF>
|
||||
# * whether the width should be dynamically chosen on each incoming
|
||||
# message
|
||||
#
|
||||
# /set neat_shrink <ON|OFF>
|
||||
# * whether shrinking of the width is allowed, or only growing
|
||||
#
|
||||
# /set neat_staircase_shrink <ON|OFF>
|
||||
# * whether shrinking should be done one character at a time
|
||||
#
|
||||
# The following styles decide if the nick is left/right aligned and
|
||||
# where the colour/mode goes, they're a bit complex...
|
||||
# put the desired indicator(s) between the appropriate "," and the
|
||||
# default format of the public messages or actions will be rewritten
|
||||
# appropriately.
|
||||
# This can be used to align the nick left or right, before or after
|
||||
# the nick brackets and before or between the nickmode (by using the
|
||||
# pad on the correct place). To change the mode from left of the nick
|
||||
# to right of the nick, you need to modify the abstracts in your theme
|
||||
# however.
|
||||
# By placing the colour at the end, you can even colour the message
|
||||
# text in the nick colour, however it might be broken if there are
|
||||
# other colour codes used inside the message or by scripts.
|
||||
#
|
||||
# /format neat_style , , , , , , , ,
|
||||
# î î î î î î î î î
|
||||
# p: pad | | | | | | | | `before message
|
||||
# c: colour | | | | | | | `-after msgchannel
|
||||
# t: truncate indicator | | | | | | `-before msgchannel
|
||||
# | | | | | `-after nick
|
||||
# | | | | `-before nick
|
||||
# | | | `-after mode
|
||||
# | | `-before mode
|
||||
# | `-before msgnick
|
||||
# `-none
|
||||
#
|
||||
# /format neat_action_style , , , ,
|
||||
# î î î î î
|
||||
# p: pad | | | | `-before message
|
||||
# c: colour | | | `-after nick
|
||||
# t: truncate indicator | | `-before nick
|
||||
# | `-before action
|
||||
# `-none
|
||||
#
|
||||
# /format neat_pad_char <char>
|
||||
# * the character(s) used for padding
|
||||
#
|
||||
# /format neat_truncate_char
|
||||
# * the format or character to indicate that nick was truncated
|
||||
#
|
||||
# /format neat_notruncate_char
|
||||
# * the format or character to indicate that nick NOT was truncated
|
||||
#
|
||||
# /format neat_customize_modes @@ | ++ | ?
|
||||
# * a |-separated mapping of mode prefixes and their rendition, can be
|
||||
# used to replace or colourise them
|
||||
#
|
||||
# /set neat_color_hinick <ON|OFF>
|
||||
# * whether to use colours in hilighted messages
|
||||
#
|
||||
# /set neat_color_menick <ON|OFF>
|
||||
# * whether to use colours in hilight_nick_matches
|
||||
#
|
||||
# /set neat_truncate_nick <ON|OFF>
|
||||
# * whether to truncate overlong nicks
|
||||
#
|
||||
# /set neat_custom_modes <ON|OFF>
|
||||
# * whether to enable the use of neat_customize_modes format
|
||||
#
|
||||
# /set neat_maxlength <number>
|
||||
# * number : (maximum) length to use for nick padding
|
||||
#
|
||||
# /set neat_melength <number>
|
||||
# * number : width to substract from maxlength for /me padding
|
||||
#
|
||||
# /set neat_history <number>
|
||||
# * number : number of formatted lines to remember for dynamic mode
|
||||
#
|
||||
|
||||
my @action_protos = qw(irc silc xmpp);
|
||||
my (%histories, %S, @style, @astyle, %format_ok, %cmmap);
|
||||
|
||||
my $align_expando = '';
|
||||
my $trunc_expando = '';
|
||||
my $cumode_expando = '';
|
||||
|
||||
my $format_re = qr/ %(?=[}%{])
|
||||
| %[04261537kbgcrmywKBGCRMYWU9_8I:|FnN>#pP[]
|
||||
| %[Zz][[:xdigit:]]{6}
|
||||
| %[Xx](?i:0[a-f]|[1-6][0-9a-z]|7[a-x]) /x;
|
||||
|
||||
sub update_expando {
|
||||
my ($mode, $server, $target, $nick, $space) = @_;
|
||||
my $t_add;
|
||||
if (exists $Irssi::Script::{'realnames::'}
|
||||
&& (my $code = 'Irssi::Script::realnames'->can('_get_nick_chan'))) {
|
||||
if (my $i = $code->($server, $target, $nick)) {
|
||||
$nick = $i->{n}{realname}
|
||||
if length $i->{n}{realname};
|
||||
}
|
||||
}
|
||||
my $nl = length $nick;
|
||||
my $pad_len = max(0, $space - $nl);
|
||||
if ($S{truncate_nick}) {
|
||||
if (($mode >= 4 && $S{trunc_in_anick})
|
||||
|| ($mode < 4 && $S{trunc_in_nick})) {
|
||||
$t_add = $S{tnolen};
|
||||
}
|
||||
if ($nl + $t_add > $space) {
|
||||
$trunc_expando = format_expand($S{tyes_char});
|
||||
$t_add = $S{tyeslen} if defined $t_add;
|
||||
}
|
||||
else {
|
||||
$trunc_expando = format_expand($S{tno_char});
|
||||
}
|
||||
$pad_len = max(0, $pad_len - $t_add) if $t_add;
|
||||
}
|
||||
else {
|
||||
$trunc_expando = '';
|
||||
}
|
||||
if ($pad_len) {
|
||||
my @subs = split /($format_re)/, $S{pad_char} x $pad_len;
|
||||
$align_expando = '';
|
||||
my $clen = 0;
|
||||
while (@subs) {
|
||||
my ($tx, $fmt) = splice @subs, 0, 2;
|
||||
my $txlen = length $tx // 0;
|
||||
$align_expando .= substr $tx, 0, ($pad_len - $clen) if defined $tx;
|
||||
$clen += $txlen;
|
||||
$align_expando .= $fmt if defined $fmt;
|
||||
last if $clen >= $pad_len;
|
||||
}
|
||||
$align_expando = format_expand($align_expando.'%n');
|
||||
}
|
||||
else {
|
||||
$align_expando = '';
|
||||
}
|
||||
return $t_add;
|
||||
}
|
||||
|
||||
sub prnt_clear_levels {
|
||||
my ($dest) = @_;
|
||||
clear_ref() if $dest->{level}
|
||||
& (MSGLEVEL_PUBLIC|MSGLEVEL_MSGS|MSGLEVEL_ACTIONS|MSGLEVEL_DCCMSGS|MSGLEVEL_NOTICES);
|
||||
}
|
||||
|
||||
sub clear_ref {
|
||||
$trunc_expando = $align_expando = $cumode_expando = '';
|
||||
}
|
||||
|
||||
sub expando_nickalign { $align_expando }
|
||||
sub expando_nicktrunc { $trunc_expando }
|
||||
sub expando_nickcumode { $cumode_expando }
|
||||
|
||||
Irssi::expando_create('nickalign', \&expando_nickalign, {
|
||||
'message public' => 'none',
|
||||
'message own_public' => 'none',
|
||||
'message private' => 'none',
|
||||
'message own_private' => 'none',
|
||||
(map { ("message $_ action" => 'none',
|
||||
"message $_ own_action" => 'none')
|
||||
} @action_protos),
|
||||
});
|
||||
Irssi::expando_create('nicktrunc', \&expando_nicktrunc, {
|
||||
'message public' => 'none',
|
||||
'message own_public' => 'none',
|
||||
'message private' => 'none',
|
||||
'message own_private' => 'none',
|
||||
(map { ("message $_ action" => 'none',
|
||||
"message $_ own_action" => 'none')
|
||||
} @action_protos),
|
||||
});
|
||||
Irssi::expando_create('nickcumode', \&expando_nickcumode, {
|
||||
'message public' => 'none',
|
||||
'message own_public' => 'none',
|
||||
'message private' => 'none',
|
||||
'message own_private' => 'none',
|
||||
(map { ("message $_ action" => 'none',
|
||||
"message $_ own_action" => 'none')
|
||||
} @action_protos),
|
||||
});
|
||||
|
||||
sub init_hist {
|
||||
my ($server, $target) = @_;
|
||||
if (my $ch = $server->channel_find($target)) {
|
||||
[ max map { length } map { $_->{nick} } $ch->nicks ]
|
||||
}
|
||||
else {
|
||||
[ max map { length } $server->{nick}, $target ]
|
||||
}
|
||||
}
|
||||
|
||||
my %em = (
|
||||
p => '$nickalign',
|
||||
c => '$nickcolor',
|
||||
t => '$nicktrunc',
|
||||
m => '$nickcumode',
|
||||
);
|
||||
|
||||
my %formats = (
|
||||
own_action => [5, '{ownaction ', '$0','}','$1' ],
|
||||
action_public => [4, '{pubaction ', '$0','}','$1' ],
|
||||
action_private => [4, '{pvtaction ', '$0','}','$2' ],
|
||||
action_private_query => [4, '{pvtaction_query ','$0','}','$2' ],
|
||||
# * * * # * *
|
||||
|
||||
own_msg_private_query => [3, '{ownprivmsgnick ', '' ,'{ownprivnick ','$2','}','' ,'}','$1' ],
|
||||
msg_private_query => [2, '{privmsgnick ' ,'' ,'' ,'$0','' ,'' ,'}','$2' ],
|
||||
own_msg => [1, '{ownmsgnick ' ,'$2',' {ownnick ' ,'$0','}','' ,'}','$1' ],
|
||||
own_msg_channel => [1, '{ownmsgnick ' ,'$3',' {ownnick ' ,'$0','}','{msgchannel $1}','}','$2' ],
|
||||
pubmsg_me => [0, '{pubmsgmenick ' ,'$2',' {menick ' ,'$0','}','' ,'}','$1' ],
|
||||
pubmsg_me_channel => [0, '{pubmsgmenick ' ,'$3',' {menick ' ,'$0','}','{msgchannel $1}','}','$2' ],
|
||||
pubmsg_hilight => [0, '{pubmsghinick $0 ','$3',' ' ,'$1', '','', ,'}','$2' ],
|
||||
pubmsg_hilight_channel => [0, '{pubmsghinick $0 ','$4',' ' ,'$1', '','{msgchannel $2}','}','$3' ],
|
||||
pubmsg => [0, '{pubmsgnick ' ,'$2',' {pubnick ' ,'$0','}','' ,'}','$1' ],
|
||||
pubmsg_channel => [0, '{pubmsgnick ' ,'$3',' {pubnick ' ,'$0','}','{msgchannel $1}','}','$2' ],
|
||||
# * * * * * # * * * *
|
||||
);
|
||||
|
||||
sub reformat_format {
|
||||
Irssi::signal_remove('command format', 'update_formats');
|
||||
Irssi::signal_remove('theme changed' => 'update_formats');
|
||||
%format_ok = () unless @_;
|
||||
my ($mode, $server, $target, $nick, $size) = @_;
|
||||
for my $fmt (keys %formats) {
|
||||
next if defined $mode && $formats{$fmt}[0] != $mode;
|
||||
|
||||
my @fs = @{ $formats{$fmt} };
|
||||
|
||||
my $ls;
|
||||
if (defined $mode) {
|
||||
$ls = $size;
|
||||
}
|
||||
else {
|
||||
$ls = $fs[0] < 4 ? $S{max} : max(0, $S{max} - $S{melength});
|
||||
}
|
||||
next if exists $format_ok{$fmt} && $format_ok{$fmt} == $ls;
|
||||
|
||||
if ($S{truncate_nick} && $ls) {
|
||||
$fs[ $fs[0] < 4 ? 4 : 2 ] =~ s/\$/\$[.$ls]/;
|
||||
}
|
||||
if ($S{custom_modes} && $fs[0] < 4) {
|
||||
$fs[2] =~ s/\$\K\d/nickcumode/;
|
||||
}
|
||||
my $s;
|
||||
local $em{c} = ''
|
||||
if ($fs[1] =~ /menick/ && !$S{color_menick})
|
||||
|| ($fs[1] =~ /hinick/ && !$S{color_hinick});
|
||||
my $sr = $fs[0] >= 4 ? \@astyle : \@style;
|
||||
for my $i (1..$#fs) {
|
||||
$s .= ($sr->[$i] =~ s/(.)/$em{$1}/gr) if defined $sr->[$i];
|
||||
$s .= $fs[$i];
|
||||
}
|
||||
Irssi::command("^format $fmt $s");
|
||||
$format_ok{$fmt} = $ls;
|
||||
}
|
||||
Irssi::signal_add_last({
|
||||
'theme changed' => 'update_formats',
|
||||
'command format' => 'update_formats',
|
||||
});
|
||||
}
|
||||
|
||||
sub update_nm {
|
||||
my ($mode, $server, $target, $nick) = @_;
|
||||
my $tg = $server->{tag};
|
||||
if (my $ch = $server->channel_find($target)) {
|
||||
$target = $ch->{name};
|
||||
my $nickobj = $ch->nick_find($nick);
|
||||
if ($nickobj) {
|
||||
$nick = $nickobj->{nick};
|
||||
my $mode = substr $nickobj->{prefixes}.' ', 0, 1;
|
||||
$cumode_expando = exists $cmmap{$mode} ? format_expand($cmmap{$mode}) : $mode;
|
||||
}
|
||||
else {
|
||||
$cumode_expando = '';
|
||||
}
|
||||
}
|
||||
elsif (my $q = $server->query_find($target)) {
|
||||
$target = $q->{name};
|
||||
}
|
||||
|
||||
my $longest;
|
||||
if ($S{dynamic}) {
|
||||
my $hist = $histories{"$tg/$target"} ||= init_hist($server, $target);
|
||||
my $last = $histories{"$tg/$target/last"} || 1;
|
||||
unshift @$hist, length $nick;
|
||||
if (@$hist > 2*$S{history}) {
|
||||
splice @$hist, $S{history};
|
||||
}
|
||||
my @add;
|
||||
unless ($S{shrink}) {
|
||||
push @add, $last;
|
||||
}
|
||||
if ($S{staircase}) {
|
||||
push @add, $last - 1
|
||||
}
|
||||
$longest = $histories{"$tg/$target/last"} = max(@$hist, @add);
|
||||
|
||||
if ($S{max} && ($S{max} < $longest || !$S{shrink})) {
|
||||
$longest = $S{max};
|
||||
}
|
||||
}
|
||||
else {
|
||||
$longest = $S{max};
|
||||
}
|
||||
|
||||
my $size = $mode < 4 ? $longest : max(0, $longest - $S{melength});
|
||||
my $t_add = update_expando($mode, $server, $target, $nick, $size);
|
||||
$size = max(0, $size - $t_add) if defined $t_add;
|
||||
if ($S{dynamic}) {
|
||||
reformat_format($mode, $server, $target, $nick, $size);
|
||||
}
|
||||
}
|
||||
|
||||
sub sig_setup {
|
||||
my %old_S = %S;
|
||||
$S{history} = Irssi::settings_get_int('neat_history');
|
||||
$S{max} = Irssi::settings_get_int('neat_maxlength');
|
||||
$S{melength} = Irssi::settings_get_int('neat_melength');
|
||||
|
||||
$S{dynamic} = Irssi::settings_get_bool('neat_dynamic');
|
||||
$S{shrink} = Irssi::settings_get_bool('neat_shrink');
|
||||
$S{staircase} = Irssi::settings_get_bool('neat_staircase_shrink');
|
||||
|
||||
$S{color_hinick} = Irssi::settings_get_bool('neat_color_hinick');
|
||||
$S{color_menick} = Irssi::settings_get_bool('neat_color_menick');
|
||||
$S{truncate_nick} = Irssi::settings_get_bool('neat_truncate_nick');
|
||||
$S{custom_modes} = Irssi::settings_get_bool('neat_custom_modes');
|
||||
|
||||
if (!defined $old_S{dynamic} || $old_S{dynamic} != $S{dynamic}) {
|
||||
%histories = ();
|
||||
reformat_format();
|
||||
}
|
||||
elsif ($old_S{max} != $S{max} || $old_S{melength} != $S{melength}
|
||||
|| $old_S{color_hinick} != $S{color_hinick} || $old_S{color_menick} != $S{color_menick}
|
||||
|| $old_S{truncate_nick} != $S{truncate_nick} || $old_S{custom_modes} != $S{custom_modes}) {
|
||||
reformat_format();
|
||||
}
|
||||
}
|
||||
|
||||
sub update_formats {
|
||||
my $was_style = "@style";
|
||||
$S{style} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_style');
|
||||
my $was_action_style = "@astyle";
|
||||
$S{action_style} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_action_style');
|
||||
$S{pad_char} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_pad_char');
|
||||
$S{tno_char} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_notruncate_char');
|
||||
$S{tnolen} = length($S{tno_char} =~ s/$format_re//gr);
|
||||
$S{tyeslen} = length($S{tyes_char} =~ s/$format_re//gr);
|
||||
$S{tyes_char} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_truncate_char');
|
||||
@style = map { y/pct//cd; $_ } split /,/, $S{style};
|
||||
@astyle = map { y/pctm//cd; $_ } split /,/, $S{action_style};
|
||||
$S{trunc_in_nick} = grep { /t/ } @style[2..min($#style, 6)];
|
||||
$S{trunc_in_anick} = grep { /t/ } @astyle[2..min($#astyle, 3)];
|
||||
my $custom_modes = Irssi::current_theme->get_format(__PACKAGE__, 'neat_custom_modes');
|
||||
%cmmap = map { (substr $_, 0, 1), (substr $_, 1) } $custom_modes =~ /(?:^\s?|\G\s?\|\s?)((?!\s\|)(?:[^\\|[:space:]]|\\.|\s(?!\||$))*)/sg;
|
||||
if ($was_style ne "@style" || $was_action_style ne "@astyle") {
|
||||
reformat_format();
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
my %format2control = (
|
||||
'F' => "\cDa", '_' => "\cDc", '|' => "\cDe", '#' => "\cDi", "n" => "\cDg", "N" => "\cDg",
|
||||
'U' => "\c_", '8' => "\cV", 'I' => "\cDf",
|
||||
);
|
||||
my %bg_base = (
|
||||
'0' => '0', '4' => '1', '2' => '2', '6' => '3', '1' => '4', '5' => '5', '3' => '6', '7' => '7',
|
||||
'x08' => '8', 'x09' => '9', 'x0a' => ':', 'x0b' => ';', 'x0c' => '<', 'x0d' => '=', 'x0e' => '>', 'x0f' => '?',
|
||||
);
|
||||
my %fg_base = (
|
||||
'k' => '0', 'b' => '1', 'g' => '2', 'c' => '3', 'r' => '4', 'm' => '5', 'p' => '5', 'y' => '6', 'w' => '7',
|
||||
'K' => '8', 'B' => '9', 'G' => ':', 'C' => ';', 'R' => '<', 'M' => '=', 'P' => '=', 'Y' => '>', 'W' => '?',
|
||||
);
|
||||
my @ext_colour_off = (
|
||||
'.', '-', ',',
|
||||
'+', "'", '&',
|
||||
);
|
||||
sub format_expand {
|
||||
$_[0] =~ s{%(Z.{6}|z.{6}|X..|x..|.)}{
|
||||
my $c = $1;
|
||||
if (exists $format2control{$c}) {
|
||||
$format2control{$c}
|
||||
}
|
||||
elsif (exists $bg_base{$c}) {
|
||||
"\cD/$bg_base{$c}"
|
||||
}
|
||||
elsif (exists $fg_base{$c}) {
|
||||
"\cD$fg_base{$c}/"
|
||||
}
|
||||
elsif ($c =~ /^[{}%]$/) {
|
||||
$c
|
||||
}
|
||||
elsif ($c =~ /^(z|Z)([[:xdigit:]]{2})([[:xdigit:]]{2})([[:xdigit:]]{2})$/) {
|
||||
my $bg = $1 eq 'z';
|
||||
my (@rgb) = map { hex $_ } $2, $3, $4;
|
||||
my $x = $bg ? 0x1 : 0;
|
||||
my $out = "\cD" . (chr -13 + ord '0');
|
||||
for (my $i = 0; $i < 3; ++$i) {
|
||||
if ($rgb[$i] > 0x20) {
|
||||
$out .= chr $rgb[$i];
|
||||
}
|
||||
else {
|
||||
$x |= 0x10 << $i; $out .= chr 0x20 + $rgb[$i];
|
||||
}
|
||||
}
|
||||
$out .= chr 0x20 + $x;
|
||||
$out
|
||||
}
|
||||
elsif ($c =~ /^(x)(?:0([[:xdigit:]])|([1-6])(?:([0-9])|([a-z]))|7([a-x]))$/i) {
|
||||
my $bg = $1 eq 'x';
|
||||
my $col = defined $2 ? hex $2
|
||||
: defined $6 ? 232 + (ord lc $6) - (ord 'a')
|
||||
: 16 + 36 * ($3 - 1) + (defined $4 ? $4 : 10 + (ord lc $5) - (ord 'a'));
|
||||
if ($col < 0x10) {
|
||||
my $chr = chr $col + ord '0';
|
||||
"\cD" . ($bg ? "/$chr" : "$chr/")
|
||||
}
|
||||
else {
|
||||
"\cD" . $ext_colour_off[($col - 0x10) / 0x50 + $bg * 3] . chr (($col - 0x10) % 0x50 - 1 + ord '0')
|
||||
}
|
||||
}
|
||||
else {
|
||||
"%$c"
|
||||
}
|
||||
}ger;
|
||||
}
|
||||
}
|
||||
|
||||
sub init {
|
||||
update_formats();
|
||||
sig_setup();
|
||||
lock_keys(%S);
|
||||
print "nm2 experimental version, please report issues. thanks!"
|
||||
}
|
||||
|
||||
Irssi::settings_add_bool('misc', 'neat_dynamic', 1);
|
||||
Irssi::settings_add_bool('misc', 'neat_shrink', 1);
|
||||
Irssi::settings_add_bool('misc', 'neat_staircase_shrink', 0);
|
||||
|
||||
Irssi::settings_add_bool('misc', 'neat_color_hinick', 0);
|
||||
Irssi::settings_add_bool('misc', 'neat_color_menick', 0);
|
||||
Irssi::settings_add_bool('misc', 'neat_truncate_nick', 1);
|
||||
Irssi::settings_add_bool('misc', 'neat_custom_modes', 0);
|
||||
|
||||
Irssi::settings_add_int('misc', 'neat_maxlength', 0);
|
||||
Irssi::settings_add_int('misc', 'neat_melength', 2);
|
||||
Irssi::settings_add_int('misc', 'neat_history', 50);
|
||||
|
||||
Irssi::signal_add('setup changed' => 'sig_setup');
|
||||
Irssi::signal_add_last({
|
||||
'setup reread' => 'sig_setup',
|
||||
'theme changed' => 'update_formats',
|
||||
'command format' => 'update_formats',
|
||||
});
|
||||
|
||||
Irssi::theme_register([
|
||||
'neat_style' => ' , , p , , c , t , , , ',
|
||||
'neat_action_style' => ' , p , , t , ',
|
||||
'neat_pad_char' => '%K.',
|
||||
'neat_truncate_char' => '%m+',
|
||||
'neat_notruncate_char' => '',
|
||||
'neat_custom_modes' => '&%B&%n | @%g@%n | +%y+%n',
|
||||
]);
|
||||
|
||||
Irssi::signal_add_first({
|
||||
'message public' => sub {
|
||||
my ($server, $msg, $nick, $address, $target) = @_;
|
||||
update_nm(0, $server, $target, $nick);
|
||||
},
|
||||
'message private' => sub {
|
||||
my ($server, $msg, $nick, $address) = @_;
|
||||
update_nm(2, $server, $nick, $nick);
|
||||
},
|
||||
(map { ("message $_ action" => sub {
|
||||
my ($server, $msg, $nick, $address, $target) = @_;
|
||||
update_nm(4, $server, $target, $nick);
|
||||
}) } qw(irc silc)),
|
||||
'message xmpp action' => sub {
|
||||
return unless @_;
|
||||
my ($server, $msg, $nick, $target) = @_;
|
||||
update_nm(4, $server, $target, $nick);
|
||||
},
|
||||
});
|
||||
|
||||
sub channel_nick {
|
||||
my ($server, $target) = @_;
|
||||
($server->channel_find($target)||+{ownnick=>$server})->{ownnick}{nick}
|
||||
}
|
||||
|
||||
Irssi::signal_add_first({
|
||||
'message own_public' => sub {
|
||||
my ($server, $msg, $target) = @_;
|
||||
update_nm(1, $server, $target, channel_nick($server, $target));
|
||||
},
|
||||
'message own_private' => sub {
|
||||
my ($server, $msg, $target) = @_;
|
||||
update_nm(3, $server, $target, $server->{nick});
|
||||
},
|
||||
(map { ("message $_ own_action" => sub {
|
||||
my ($server, $msg, $target) = @_;
|
||||
update_nm(5, $server, $target, $server->{nick});
|
||||
}) } qw(irc silc)),
|
||||
'message xmpp own_action' => sub {
|
||||
return unless @_;
|
||||
my ($server, $msg, $target) = @_;
|
||||
update_nm(5, $server, $target, channel_nick($server, $target));
|
||||
},
|
||||
});
|
||||
Irssi::signal_add_last({
|
||||
'channel destroyed' => sub {
|
||||
my ($channel) = @_;
|
||||
delete $histories{ $channel->{server}{tag} . '/' . $channel->{name} };
|
||||
delete $histories{ $channel->{server}{tag} . '/' . $channel->{name} . '/last' };
|
||||
},
|
||||
'query destroyed' => sub {
|
||||
my ($query) = @_;
|
||||
delete $histories{ $query->{server}{tag} . '/' . $query->{name} };
|
||||
delete $histories{ $query->{server}{tag} . '/' . $query->{name} . '/last' };
|
||||
},
|
||||
'query nick changed' => sub {
|
||||
my ($query, $old_nick) = @_;
|
||||
delete $histories{ $query->{server}{tag} . '/' . $old_nick };
|
||||
delete $histories{ $query->{server}{tag} . '/' . $old_nick . '/last' };
|
||||
},
|
||||
'query server changed' => sub {
|
||||
my ($query, $old_server) = @_;
|
||||
delete $histories{ $old_server->{tag} . '/' . $query->{name} };
|
||||
delete $histories{ $old_server->{tag} . '/' . $query->{name} . '/last' };
|
||||
}
|
||||
});
|
||||
Irssi::signal_add({
|
||||
'print text' => 'prnt_clear_levels',
|
||||
});
|
||||
|
||||
init();
|
||||
|
||||
# Changelog
|
||||
# =========
|
||||
# 2.1 - support realnames script
|
||||
#
|
||||
# 2.0
|
||||
# - fix crash if xmpp action signal is not registered (just ignore it)
|
||||
# - do not grow either when using no-shrink with maxlength
|
||||
# - hopefully fix alignment in xmpp muc
|
||||
169
plan3.md
169
plan3.md
|
|
@ -1,169 +0,0 @@
|
|||
# KOMPLEKSOWY PLAN IMPLEMENTACJI - NOWE PODEJŚCIE
|
||||
|
||||
## WYTYCZNE OBOWIĄZKOWE:
|
||||
1. **Zawsze pamiętaj kontekst**: `msg_flow.md` i `summary.md`
|
||||
2. **Nie zbaczaj z wyznaczonej ścieżki** - trzymaj się planu
|
||||
3. **Checkpoint commits**: Po zmianach commit z pushem zawierający info o zmianach i timestamp (data + dokładna godzina)
|
||||
4. **ZAKAZ `ninja Build install`** - tylko build do sprawdzenia błędów kompilacji
|
||||
|
||||
## ANALIZA PROBLEMU
|
||||
|
||||
**KLUCZOWA OBSERWACJA**: Po analizie `msg_flow.md` i `summary.md` widzę, że:
|
||||
|
||||
1. ❌ **`parse_special` + `ALIGN_COMBINE_MODE`** - już próbowane, problem z kolorami
|
||||
2. ❌ **Expandos** - nie mają dostępu do `arglist`, zwracają puste stringi
|
||||
3. ✅ **NOWE ROZWIĄZANIE**: Modyfikacja na poziomie **`format_get_text_args`** (krok 10 w flow)
|
||||
|
||||
## STRATEGIA: INTEGRACJA Z ARGUMENTAMI FORMATOWANIA
|
||||
|
||||
### KLUCZOWA IDEA:
|
||||
Zamiast modyfikować `parse_special` lub tworzyć expandos, **wstrzykniemy dodatkowy parametr padding bezpośrednio do `arglist`** w `format_get_text_args()`.
|
||||
|
||||
## PLAN IMPLEMENTACJI
|
||||
|
||||
### FAZA 1: Przygotowanie Infrastruktury
|
||||
|
||||
#### 1.1 Dodanie ustawień konfiguracyjnych
|
||||
**Plik**: `src/fe-common/core/fe-settings.c`
|
||||
```c
|
||||
// Dodać do settings_add_*():
|
||||
settings_add_bool("lookandfeel", "nick_column_enabled", FALSE);
|
||||
settings_add_int("lookandfeel", "nick_column_width", 12);
|
||||
```
|
||||
|
||||
#### 1.2 Dodanie flag do TEXT_DEST_REC
|
||||
**Plik**: `src/fe-common/core/printtext.h`
|
||||
```c
|
||||
typedef struct {
|
||||
// ... istniejące pola
|
||||
int flags; // nowe pole dla flag formatowania
|
||||
} TEXT_DEST_REC;
|
||||
|
||||
#define PRINT_FLAG_NICK_COLUMN 0x01
|
||||
```
|
||||
|
||||
### FAZA 2: Modyfikacja Flow Formatowania
|
||||
|
||||
#### 2.1 Ustawienie flagi w obsłudze wiadomości
|
||||
**Plik**: `src/fe-common/core/fe-messages.c`
|
||||
|
||||
W funkcjach `sig_message_public()` i `sig_message_own_public()`:
|
||||
```c
|
||||
// Po utworzeniu dest przez format_create_dest()
|
||||
if (settings_get_bool("nick_column_enabled")) {
|
||||
dest.flags |= PRINT_FLAG_NICK_COLUMN;
|
||||
}
|
||||
```
|
||||
|
||||
#### 2.2 Główna logika w format_get_text_args
|
||||
**Plik**: `src/fe-common/core/formats.c`
|
||||
|
||||
W funkcji `format_get_text_args()` (krok 10 flow), **PRZED** pętlą parsowania:
|
||||
|
||||
```c
|
||||
// Sprawdź czy nick column jest włączony
|
||||
if (dest && (dest->flags & PRINT_FLAG_NICK_COLUMN)) {
|
||||
// Znajdź parametry mode i nick w arglist
|
||||
char *mode = NULL, *nick = NULL;
|
||||
|
||||
// Dla TXT_PUBMSG: args[0]=nick, args[3]=nickmode
|
||||
// Dla TXT_OWN_MSG: args[0]=nick, args[3]=nickmode
|
||||
if (args && args[0] && args[3]) {
|
||||
nick = args[0];
|
||||
mode = args[3];
|
||||
|
||||
// Oblicz padding
|
||||
int width = settings_get_int("nick_column_width");
|
||||
int mode_len = strlen(mode);
|
||||
int nick_len = strlen(nick);
|
||||
int total_len = mode_len + nick_len;
|
||||
|
||||
if (total_len < width) {
|
||||
int padding_len = width - total_len;
|
||||
char *padding = g_strnfill(padding_len, ' ');
|
||||
|
||||
// Wstrzyknij padding jako nowy parametr na początku
|
||||
// Przesuń wszystkie argumenty o 1 pozycję w prawo
|
||||
// args[0] = padding, args[1] = nick, args[4] = mode
|
||||
// Theme będzie używać: $0 (padding) + $4 (mode) + $1 (nick)
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### FAZA 3: Modyfikacja Theme
|
||||
|
||||
#### 3.1 Aktualizacja abstracts w default.theme
|
||||
```theme
|
||||
# Gdy nick_column_enabled = ON, argumenty są przesunięte:
|
||||
# $0 = padding (nowy)
|
||||
# $1 = nick (przesunięty z $0)
|
||||
# $4 = mode (przesunięty z $3)
|
||||
|
||||
# Podstawowy abstract z padding
|
||||
msgnick = "%K<%n$0%B$4%N%g$1%K>%n %|";
|
||||
|
||||
# Own messages
|
||||
ownmsgnick = "{msgnick $0 $4 $1}";
|
||||
|
||||
# Public messages
|
||||
pubmsgnick = "{msgnick $0 $4 $1}";
|
||||
```
|
||||
|
||||
### FAZA 4: Testowanie i Debugowanie
|
||||
|
||||
#### 4.1 Dodanie debug outputu
|
||||
```c
|
||||
// W format_get_text_args() dodać:
|
||||
if (settings_get_bool("debug_nick_column")) {
|
||||
printf("DEBUG: nick_column - padding='%s', mode='%s', nick='%s'\n",
|
||||
padding, mode, nick);
|
||||
}
|
||||
```
|
||||
|
||||
#### 4.2 Checkpoint commit
|
||||
```bash
|
||||
git add -A
|
||||
git commit -m "[nick_column] FAZA 1-4: Infrastruktura + logika padding - 2025-01-24 15:30"
|
||||
git push origin irssip
|
||||
```
|
||||
|
||||
## HARMONOGRAM IMPLEMENTACJI
|
||||
|
||||
### Dzień 1: Infrastruktura
|
||||
- [ ] Dodanie ustawień (`nick_column_enabled`, `nick_column_width`)
|
||||
- [ ] Dodanie flag do `TEXT_DEST_REC`
|
||||
- [ ] Checkpoint commit
|
||||
|
||||
### Dzień 2: Logika formatowania
|
||||
- [ ] Modyfikacja `sig_message_public()` i `sig_message_own_public()`
|
||||
- [ ] Implementacja logiki padding w `format_get_text_args()`
|
||||
- [ ] Checkpoint commit
|
||||
|
||||
### Dzień 3: Theme i testowanie
|
||||
- [ ] Aktualizacja `default.theme`
|
||||
- [ ] Dodanie debug outputu
|
||||
- [ ] Build test (bez install)
|
||||
- [ ] Checkpoint commit
|
||||
|
||||
## PRZEWIDYWANE WYZWANIA
|
||||
|
||||
### 1. Przesunięcie argumentów
|
||||
**Problem**: Wstrzyknięcie padding przesuwa wszystkie argumenty
|
||||
**Rozwiązanie**: Dokładne mapowanie argumentów w theme
|
||||
|
||||
### 2. Kompatybilność wsteczna
|
||||
**Problem**: Theme musi działać z wyłączonym nick_column
|
||||
**Rozwiązanie**: Warunki w theme lub osobne abstracts
|
||||
|
||||
### 3. Różne formaty wiadomości
|
||||
**Problem**: `TXT_PUBMSG`, `TXT_OWN_MSG`, `TXT_PUBMSG_HILIGHT` mają różne argumenty
|
||||
**Rozwiązanie**: Mapowanie per format type
|
||||
|
||||
## KRYTERIA SUKCESU
|
||||
|
||||
✅ **Wyrównanie działa** - nicki wyrównane do prawej w kolumnie
|
||||
✅ **Kolory zachowane** - osobne kolory dla mode i nick
|
||||
✅ **Konfigurowalność** - szerokość przez ustawienia
|
||||
✅ **Kompatybilność** - działa z wyłączonym nick_column
|
||||
✅ **Brak wpływu na resztę** - standardowe formatowanie nietknięte
|
||||
202
plan4.md
202
plan4.md
|
|
@ -1,202 +0,0 @@
|
|||
# PLAN 4: Nick Column - Podejście Expandos z Kontekstem Sygnałów
|
||||
|
||||
## ANALIZA BŁĘDÓW POPRZEDNICH PRÓB
|
||||
|
||||
### PRÓBA 1-3: Fundamentalne błędy
|
||||
- ❌ **Błędna analiza argumentów**: Myślałem że `$0=nick`, ale `$0=mode`, `$1=nick`
|
||||
- ❌ **Modyfikacja argumentów**: Przesuwanie `arglist` psuło mapowanie
|
||||
- ❌ **Expandos bez kontekstu**: Nie miały dostępu do aktualnych danych wiadomości
|
||||
- ❌ **Ignorowanie nm2.pl**: Nie przeanalizowałem właściwego wzorca
|
||||
|
||||
### KLUCZOWE ODKRYCIA Z TESTÓW UŻYTKOWNIKA
|
||||
|
||||
**Rzeczywiste mapowanie argumentów:**
|
||||
```
|
||||
$0 = mode ("@", "+", "")
|
||||
$1 = nick ("kofany", "irssip_user")
|
||||
$2 = address/msg (zależnie od kontekstu)
|
||||
$3 = msg/channel (zależnie od kontekstu)
|
||||
```
|
||||
|
||||
**Oczekiwany efekt:**
|
||||
```
|
||||
22:11:35> < @yooz> no działa ;]
|
||||
22:12:24> < @nosfar> starsze rzeczy ;p
|
||||
22:12:38> < @yooz> to zamknij oczy
|
||||
22:14:22> < DMZ> ✅ Link dodany do bazy!
|
||||
22:14:22> < +verylongn+> długi nick przycięty
|
||||
```
|
||||
|
||||
## ROZWIĄZANIE: INSPIRACJA Z nm2.pl
|
||||
|
||||
### KLUCZOWA IDEA
|
||||
**Jeden expando zwracający gotowy string z paddingiem, mode i nickiem**
|
||||
|
||||
**Theme używa:**
|
||||
```theme
|
||||
msgnick = "%K<%n$nickaligned%K>%n %|";
|
||||
```
|
||||
|
||||
**Efekt:**
|
||||
- `$nickaligned` = `" @nick"` lub `" @longnick+"`
|
||||
- Stała szerokość kolumny
|
||||
- Wyrównanie do prawej
|
||||
- Przycinanie długich nicków
|
||||
|
||||
## IMPLEMENTACJA
|
||||
|
||||
### 1. GLOBALNE ZMIENNE KONTEKSTU
|
||||
```c
|
||||
// W fe-expandos.c
|
||||
static char *current_nick = NULL;
|
||||
static char *current_mode = NULL;
|
||||
static gboolean nick_context_valid = FALSE;
|
||||
```
|
||||
|
||||
### 2. EXPANDO FUNKCJA
|
||||
```c
|
||||
static char *expando_nickaligned(SERVER_REC *server, void *item, int *free_ret) {
|
||||
if (!settings_get_bool("nick_column_enabled") || !nick_context_valid || !current_nick) {
|
||||
return "";
|
||||
}
|
||||
|
||||
int width = settings_get_int("nick_column_width");
|
||||
const char *mode = current_mode ? current_mode : "";
|
||||
int mode_len = strlen(mode);
|
||||
int nick_len = strlen(current_nick);
|
||||
int total_len = mode_len + nick_len;
|
||||
|
||||
char *result;
|
||||
if (total_len <= width) {
|
||||
// Zmieści się - padding z lewej
|
||||
int padding = width - total_len;
|
||||
result = g_strdup_printf("%*s%s%s", padding, "", mode, current_nick);
|
||||
} else {
|
||||
// Przytnij nick, dodaj wskaźnik +
|
||||
int available = width - mode_len - 1; // -1 dla +
|
||||
if (available > 0) {
|
||||
result = g_strdup_printf("%s%.*s+", mode, available, current_nick);
|
||||
} else {
|
||||
result = g_strdup_printf("%.*s+", width-1, mode);
|
||||
}
|
||||
}
|
||||
|
||||
*free_ret = TRUE;
|
||||
return result;
|
||||
}
|
||||
```
|
||||
|
||||
### 3. REJESTRACJA EXPANDO
|
||||
```c
|
||||
// W fe_expandos_init()
|
||||
expando_create("nickaligned", expando_nickaligned,
|
||||
"message public", EXPANDO_ARG_NONE,
|
||||
"message own_public", EXPANDO_ARG_NONE, NULL);
|
||||
```
|
||||
|
||||
### 4. SYGNAŁY DO AKTUALIZACJI KONTEKSTU
|
||||
```c
|
||||
// W fe-messages.c
|
||||
static void update_nick_context(const char *nick, const char *mode) {
|
||||
g_free(current_nick);
|
||||
g_free(current_mode);
|
||||
current_nick = g_strdup(nick);
|
||||
current_mode = g_strdup(mode ? mode : "");
|
||||
nick_context_valid = TRUE;
|
||||
}
|
||||
|
||||
static void clear_nick_context(void) {
|
||||
nick_context_valid = FALSE;
|
||||
}
|
||||
|
||||
// W sig_message_public():
|
||||
if (settings_get_bool("nick_column_enabled")) {
|
||||
update_nick_context(printnick, nickmode);
|
||||
}
|
||||
|
||||
// W sig_message_own_public():
|
||||
if (settings_get_bool("nick_column_enabled")) {
|
||||
update_nick_context(server->nick, nickmode);
|
||||
}
|
||||
```
|
||||
|
||||
### 5. USTAWIENIA
|
||||
```c
|
||||
// W fe_messages_init()
|
||||
settings_add_bool("lookandfeel", "nick_column_enabled", FALSE);
|
||||
settings_add_int("lookandfeel", "nick_column_width", 12);
|
||||
settings_add_bool("lookandfeel", "debug_nick_column", FALSE);
|
||||
```
|
||||
|
||||
### 6. THEME
|
||||
```theme
|
||||
# Podstawowy abstract - używa tylko $nickaligned
|
||||
msgnick = "%K<%n$nickaligned%K>%n %|";
|
||||
|
||||
# Pozostałe abstracts bez zmian
|
||||
ownmsgnick = "{msgnick $0 $1-}";
|
||||
pubmsgnick = "{msgnick $0 $1-}";
|
||||
```
|
||||
|
||||
## DLACZEGO TO ROZWIĄZANIE BĘDZIE DZIAŁAĆ
|
||||
|
||||
### ✅ ZALETY TEGO PODEJŚCIA:
|
||||
|
||||
1. **Nie modyfikuje argumentów** - `$0`, `$1`, `$2` pozostają bez zmian
|
||||
2. **Expandos mają kontekst** - aktualizowane przez sygnały przed formatowaniem
|
||||
3. **Jeden parametr w theme** - prosty `$nickaligned` zamiast skomplikowanych kombinacji
|
||||
4. **Wzorowane na nm2.pl** - sprawdzone rozwiązanie używane przez tysiące użytkowników
|
||||
5. **Kompatybilne** - domyślnie wyłączone, nie wpływa na resztę
|
||||
6. **Konfigurowalny** - szerokość, włączanie/wyłączanie
|
||||
7. **Obsługuje przycinanie** - długie nicki z wskaźnikiem `+`
|
||||
|
||||
### ✅ FLOW DZIAŁANIA:
|
||||
|
||||
1. **Sygnał wiadomości** → aktualizuje `current_nick`, `current_mode`
|
||||
2. **Formatowanie** → wywołuje expando `$nickaligned`
|
||||
3. **Expando** → oblicza padding, zwraca gotowy string
|
||||
4. **Theme** → wyświetla `<padding+mode+nick>` w stałej szerokości
|
||||
|
||||
### ✅ PRZYKŁAD DZIAŁANIA:
|
||||
|
||||
**Ustawienia:**
|
||||
```
|
||||
/SET nick_column_enabled ON
|
||||
/SET nick_column_width 12
|
||||
```
|
||||
|
||||
**Wiadomości:**
|
||||
- `@kofany` (7 znaków) → padding 5 → `" @kofany"`
|
||||
- `irssip_user` (10 znaków) → padding 2 → `" irssip_user"`
|
||||
- `@verylongnickname` (17 znaków) → przytnij → `"@verylongn+"`
|
||||
|
||||
**Wynik:**
|
||||
```
|
||||
22:11:35> < @kofany> test wiadomość
|
||||
22:12:24> < irssip_user> odpowiedź
|
||||
22:12:38> < @verylongn+> długi nick
|
||||
```
|
||||
|
||||
## UZASADNIENIE DLACZEGO TYM RAZEM ZADZIAŁA
|
||||
|
||||
### 1. **WŁAŚCIWA ANALIZA**
|
||||
- Przeanalizowałem rzeczywiste mapowanie argumentów z testów użytkownika
|
||||
- Zrozumiałem jak działa nm2.pl
|
||||
- Nie modyfikuję istniejących argumentów
|
||||
|
||||
### 2. **SPRAWDZONY WZORZEC**
|
||||
- nm2.pl używa dokładnie tego samego podejścia
|
||||
- Expandos + sygnały + kontekst globalny
|
||||
- Tysiące użytkowników potwierdza że działa
|
||||
|
||||
### 3. **MINIMALNA INGERENCJA**
|
||||
- Tylko dodaję nowy expando
|
||||
- Nie zmieniam core flow formatowania
|
||||
- Theme używa jednego prostego parametru
|
||||
|
||||
### 4. **TESTOWALNE**
|
||||
- Można łatwo debugować wartości expandos
|
||||
- Można włączać/wyłączać funkcję
|
||||
- Można testować różne szerokości
|
||||
|
||||
**To rozwiązanie MUSI zadziałać, bo jest wzorowane na działającym kodzie nm2.pl!**
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_COMMON_H
|
||||
#define IRSSI_COMMON_H
|
||||
|
||||
#define IRSSI_DIR_FULL "%s/.irssip" /* %s == g_get_home_dir() */
|
||||
#define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */
|
||||
|
||||
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
|
||||
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
#define DEFAULT_SERVER_ADD_PORT 6667
|
||||
#define DEFAULT_SERVER_ADD_TLS_PORT 6697
|
||||
|
||||
#include <irssip/irssi-config.h>
|
||||
#include <irssi/irssi-config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/args.h>
|
||||
#include <irssi/src/core/args.h>
|
||||
|
||||
static GOptionContext *context = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/log.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/network-openssl.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/log.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/network-openssl.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/capsicum.h>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* CHANNEL_REC definition, used for inheritance */
|
||||
|
||||
#include <irssip/src/core/window-item-rec.h>
|
||||
#include <irssi/src/core/window-item-rec.h>
|
||||
|
||||
char *topic;
|
||||
char *topic_by;
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/channels-setup.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/channels-setup.h>
|
||||
|
||||
GSList *setupchannels;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_CHANNELS_SETUP_H
|
||||
#define IRSSI_CORE_CHANNELS_SETUP_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
#define CHANNEL_SETUP(server) \
|
||||
MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP")
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
(CHANNEL_SETUP(server) ? TRUE : FALSE)
|
||||
|
||||
struct _CHANNEL_SETUP_REC {
|
||||
#include <irssip/src/core/channel-setup-rec.h>
|
||||
#include <irssi/src/core/channel-setup-rec.h>
|
||||
};
|
||||
|
||||
extern GSList *setupchannels;
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/channels-setup.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/channels-setup.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
|
||||
GSList *channels; /* List of all channels */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_CHANNELS_H
|
||||
#define IRSSI_CORE_CHANNELS_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
/* Returns CHANNEL_REC if it's channel, NULL if it isn't. */
|
||||
#define CHANNEL(channel) \
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#define STRUCT_SERVER_REC SERVER_REC
|
||||
struct _CHANNEL_REC {
|
||||
#include <irssip/src/core/channel-rec.h>
|
||||
#include <irssi/src/core/channel-rec.h>
|
||||
};
|
||||
|
||||
extern GSList *channels;
|
||||
|
|
|
|||
|
|
@ -19,21 +19,21 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/servers-reconnect.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssip/src/core/window-item-def.h>
|
||||
#include <irssip/src/core/rawlog.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/servers-reconnect.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
#include <irssi/src/core/window-item-def.h>
|
||||
#include <irssi/src/core/rawlog.h>
|
||||
|
||||
static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
|
||||
char **rawlog_file)
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/channels-setup.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/channels-setup.h>
|
||||
|
||||
GSList *chat_protocols;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
|
||||
GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_CHATNETS_H
|
||||
#define IRSSI_CORE_CHATNETS_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
/* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */
|
||||
#define CHATNET(chatnet) \
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
(CHATNET(chatnet) ? TRUE : FALSE)
|
||||
|
||||
struct _CHATNET_REC {
|
||||
#include <irssip/src/core/chatnet-rec.h>
|
||||
#include <irssi/src/core/chatnet-rec.h>
|
||||
};
|
||||
|
||||
extern GSList *chatnets; /* list of available chat networks */
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/window-item-def.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/window-item-def.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
GSList *commands;
|
||||
char *current_command;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_COMMANDS_H
|
||||
#define IRSSI_CORE_COMMANDS_H
|
||||
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
typedef struct {
|
||||
SIGNAL_FUNC func;
|
||||
|
|
|
|||
|
|
@ -21,35 +21,35 @@
|
|||
#include "module.h"
|
||||
#include <signal.h>
|
||||
|
||||
#include <irssip/src/core/args.h>
|
||||
#include <irssip/src/core/pidwait.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/args.h>
|
||||
#include <irssi/src/core/pidwait.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/net-disconnect.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/session.h>
|
||||
#include <irssi/src/core/net-disconnect.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/session.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#endif
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/expandos.h>
|
||||
#include <irssip/src/core/ignore.h>
|
||||
#include <irssip/src/core/log.h>
|
||||
#include <irssip/src/core/rawlog.h>
|
||||
#include <irssip/src/core/recode.h>
|
||||
#include <irssip/src/core/refstrings.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/write-buffer.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/expandos.h>
|
||||
#include <irssi/src/core/ignore.h>
|
||||
#include <irssi/src/core/log.h>
|
||||
#include <irssi/src/core/rawlog.h>
|
||||
#include <irssi/src/core/recode.h>
|
||||
#include <irssi/src/core/refstrings.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/write-buffer.h>
|
||||
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssip/src/core/nickmatch-cache.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
#include <irssi/src/core/nickmatch-cache.h>
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
# include <sys/resource.h>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_CORE_H
|
||||
#define IRSSI_CORE_CORE_H
|
||||
|
||||
#include <irssip/src/common.h>
|
||||
#include <irssi/src/common.h>
|
||||
|
||||
/* for determining what GUI is currently in use: */
|
||||
#define IRSSI_GUI_NONE 0
|
||||
|
|
|
|||
|
|
@ -18,20 +18,20 @@
|
|||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <irssip/src/core/core.h>
|
||||
#include <irssi/src/core/core.h>
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/expandos.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/irssi-version.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/expandos.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/irssi-version.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssip/src/core/window-item-def.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
#include <irssi/src/core/window-item-def.h>
|
||||
|
||||
#ifdef HAVE_SYS_UTSNAME_H
|
||||
# include <sys/utsname.h>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_EXPANDOS_H
|
||||
#define IRSSI_CORE_EXPANDOS_H
|
||||
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
/* first argument of signal must match to active .. */
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/iregex.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/iregex.h>
|
||||
|
||||
#include <irssip/src/core/masks.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssip/src/core/nickmatch-cache.h>
|
||||
#include <irssi/src/core/masks.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
#include <irssi/src/core/nickmatch-cache.h>
|
||||
|
||||
#include <irssip/src/core/ignore.h>
|
||||
#include <irssi/src/core/ignore.h>
|
||||
|
||||
GSList *ignores;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_IGNORE_H
|
||||
#define IRSSI_CORE_IGNORE_H
|
||||
|
||||
#include <irssip/src/core/iregex.h>
|
||||
#include <irssi/src/core/iregex.h>
|
||||
|
||||
typedef struct _IGNORE_REC IGNORE_REC;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <string.h>
|
||||
|
||||
#include <irssip/src/core/iregex.h>
|
||||
#include <irssi/src/core/iregex.h>
|
||||
|
||||
struct _MatchInfo {
|
||||
const char *valid_string;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_IREGEX_H
|
||||
#define IRSSI_CORE_IREGEX_H
|
||||
|
||||
#include <irssip/src/common.h>
|
||||
#include <irssi/src/common.h>
|
||||
|
||||
#include <glib.h>
|
||||
typedef GRegex Regex;
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
|
||||
/* the order of these levels must match the bits in levels.h */
|
||||
static const char *levels[] = {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
/* Maximum line length - split to two lines if it's longer than this.
|
||||
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/log.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/write-buffer.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/log.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/write-buffer.h>
|
||||
|
||||
static LOG_REC *awaylog;
|
||||
static int away_filepos;
|
||||
|
|
|
|||
|
|
@ -19,19 +19,19 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/log.h>
|
||||
#include <irssip/src/core/write-buffer.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/log.h>
|
||||
#include <irssi/src/core/write-buffer.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#endif
|
||||
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#define DEFAULT_LOG_FILE_CREATE_MODE 600
|
||||
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
|
||||
/* Returns TRUE if mask contains '!' ie. address should be checked too.
|
||||
Also checks if mask contained any wildcards. */
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
|
||||
typedef struct {
|
||||
int condition;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#include <irssip/src/common.h>
|
||||
#include <irssi/src/common.h>
|
||||
|
||||
#define MODULE_NAME "core"
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/modules-load.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/modules-load.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
/* Returns the module name without path, "lib" prefix or ".so" suffix */
|
||||
static char *module_get_name(const char *path, int *start, int *end)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_MODULES_LOAD_H
|
||||
#define IRSSI_CORE_MODULES_LOAD_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
/* Load module - automatically tries to load also the related non-core
|
||||
modules given in `prefixes' (like irc, fe, fe_text, ..) */
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
GSList *modules;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
|
||||
#include <sys/select.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
#include <signal.h>
|
||||
|
||||
#include <irssip/src/core/pidwait.h>
|
||||
#include <irssip/src/core/net-nonblock.h>
|
||||
#include <irssi/src/core/pidwait.h>
|
||||
#include <irssi/src/core/net-nonblock.h>
|
||||
|
||||
/* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
|
||||
written to pipe when found PID of the resolver child is returned */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_NET_NONBLOCK_H
|
||||
#define IRSSI_CORE_NET_NONBLOCK_H
|
||||
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
|
||||
typedef struct {
|
||||
IPADDR ip4, ip6; /* resolved ip addresses */
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
|
||||
#include "module.h"
|
||||
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/net-sendbuffer.h>
|
||||
#include <irssip/src/core/line-split.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/net-sendbuffer.h>
|
||||
#include <irssi/src/core/line-split.h>
|
||||
|
||||
/* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
|
||||
is used */
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/network-openssl.h>
|
||||
#include <irssip/src/core/net-sendbuffer.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/tls.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/network-openssl.h>
|
||||
#include <irssi/src/core/net-sendbuffer.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/tls.h>
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/objects.h>
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#endif
|
||||
|
||||
#include <sys/un.h>
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssip/src/core/masks.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
#include <irssi/src/core/masks.h>
|
||||
|
||||
#define isalnumhigh(a) \
|
||||
(i_isalnum(a) || (unsigned char) (a) >= 128)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#define MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */
|
||||
|
||||
struct _NICK_REC {
|
||||
#include <irssip/src/core/nick-rec.h>
|
||||
#include <irssi/src/core/nick-rec.h>
|
||||
};
|
||||
|
||||
/* Add new nick to list */
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
|
||||
#include <irssip/src/core/nickmatch-cache.h>
|
||||
#include <irssi/src/core/nickmatch-cache.h>
|
||||
|
||||
static GSList *lists;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
static GHashTable *child_pids;
|
||||
static GSList *pids;
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
|
||||
GSList *queries;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_QUERIES_H
|
||||
#define IRSSI_CORE_QUERIES_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
/* Returns QUERY_REC if it's query, NULL if it isn't. */
|
||||
#define QUERY(query) \
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#define STRUCT_SERVER_REC SERVER_REC
|
||||
struct _QUERY_REC {
|
||||
#include <irssip/src/core/query-rec.h>
|
||||
#include <irssi/src/core/query-rec.h>
|
||||
};
|
||||
|
||||
extern GSList *queries;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* QUERY_REC definition, used for inheritance */
|
||||
|
||||
#include <irssip/src/core/window-item-rec.h>
|
||||
#include <irssi/src/core/window-item-rec.h>
|
||||
|
||||
char *address;
|
||||
char *server_tag;
|
||||
|
|
|
|||
|
|
@ -19,19 +19,19 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/rawlog.h>
|
||||
#include <irssip/src/core/log.h>
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/write-buffer.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/rawlog.h>
|
||||
#include <irssi/src/core/log.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/write-buffer.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#endif
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
|
||||
static int rawlog_lines;
|
||||
static int signal_rawlog;
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
static char *translit_charset;
|
||||
static gboolean term_is_utf8;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include <glib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <irssip/src/core/refstrings.h>
|
||||
#include <irssi/src/core/refstrings.h>
|
||||
|
||||
#if GLIB_CHECK_VERSION(2, 58, 0)
|
||||
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/servers-reconnect.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/servers-reconnect.h>
|
||||
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
GSList *reconnects;
|
||||
static int last_reconnect_tag;
|
||||
|
|
|
|||
|
|
@ -19,15 +19,15 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
|
||||
GSList *setupservers;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_SERVERS_SETUP_H
|
||||
#define IRSSI_CORE_SERVERS_SETUP_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
#define SERVER_SETUP(server) \
|
||||
MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP")
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
/* servers */
|
||||
struct _SERVER_SETUP_REC {
|
||||
#include <irssip/src/core/server-setup-rec.h>
|
||||
#include <irssi/src/core/server-setup-rec.h>
|
||||
};
|
||||
|
||||
extern GSList *setupservers;
|
||||
|
|
|
|||
|
|
@ -19,22 +19,22 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/net-disconnect.h>
|
||||
#include <irssip/src/core/net-nonblock.h>
|
||||
#include <irssip/src/core/net-sendbuffer.h>
|
||||
#include <irssip/src/core/rawlog.h>
|
||||
#include <irssip/src/core/refstrings.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/net-disconnect.h>
|
||||
#include <irssi/src/core/net-nonblock.h>
|
||||
#include <irssi/src/core/net-sendbuffer.h>
|
||||
#include <irssi/src/core/rawlog.h>
|
||||
#include <irssi/src/core/refstrings.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-reconnect.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-reconnect.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
|
||||
GSList *servers, *lookup_servers;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_SERVERS_H
|
||||
#define IRSSI_CORE_SERVERS_H
|
||||
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
/* Returns SERVER_REC if it's server, NULL if it isn't. */
|
||||
#define SERVER(server) \
|
||||
|
|
@ -23,12 +23,12 @@
|
|||
/* all strings should be either NULL or dynamically allocated */
|
||||
/* address and nick are mandatory, rest are optional */
|
||||
struct _SERVER_CONNECT_REC {
|
||||
#include <irssip/src/core/server-connect-rec.h>
|
||||
#include <irssi/src/core/server-connect-rec.h>
|
||||
};
|
||||
|
||||
#define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC
|
||||
struct _SERVER_REC {
|
||||
#include <irssip/src/core/server-rec.h>
|
||||
#include <irssi/src/core/server-rec.h>
|
||||
};
|
||||
|
||||
#define SEND_TARGET_CHANNEL 0
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/args.h>
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/net-sendbuffer.h>
|
||||
#include <irssip/src/core/pidwait.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/args.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/net-sendbuffer.h>
|
||||
#include <irssi/src/core/pidwait.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
|
||||
static char *session_file;
|
||||
char *irssi_binary = NULL;
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/recode.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/recode.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include "default-config.h"
|
||||
|
||||
#include <signal.h>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
|
||||
typedef struct _SignalHook {
|
||||
struct _SignalHook *next;
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/expandos.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/refstrings.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/utf8.h>
|
||||
#include <irssi/src/core/expandos.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/refstrings.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/utf8.h>
|
||||
|
||||
#define isvarchar(c) \
|
||||
(i_isalnum(c) || (c) == '_')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_CORE_SPECIAL_VARS_H
|
||||
#define IRSSI_CORE_SPECIAL_VARS_H
|
||||
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
#define PARSE_FLAG_GETNAME 0x01 /* return argument name instead of it's value */
|
||||
#define PARSE_FLAG_ISSET_ANY 0x02 /* arg_used field specifies that at least one of the $variables was non-empty */
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "module.h"
|
||||
|
||||
#include <irssip/src/core/tls.h>
|
||||
#include <irssi/src/core/tls.h>
|
||||
|
||||
TLS_REC *tls_create_rec()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <irssip/src/core/utf8.h>
|
||||
#include <irssi/src/core/utf8.h>
|
||||
#include "module.h"
|
||||
|
||||
/* Provide is_utf8(): */
|
||||
#include <irssip/src/core/recode.h>
|
||||
#include <irssi/src/core/recode.h>
|
||||
|
||||
int string_advance(char const **str, int policy)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@
|
|||
#include <wchar.h>
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/utf8.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/utf8.h>
|
||||
|
||||
#ifdef HAVE_LIBUTF8PROC
|
||||
#include <utf8proc.h>
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
* Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
|
||||
*/
|
||||
|
||||
#include <irssip/src/core/utf8.h>
|
||||
#include <irssi/src/core/utf8.h>
|
||||
|
||||
struct interval {
|
||||
int first;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#define STRUCT_SERVER_REC SERVER_REC
|
||||
struct _WI_ITEM_REC {
|
||||
#include <irssip/src/core/window-item-rec.h>
|
||||
#include <irssi/src/core/window-item-rec.h>
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/write-buffer.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/write-buffer.h>
|
||||
|
||||
#define BUFFER_BLOCK_SIZE 2048
|
||||
|
||||
|
|
|
|||
|
|
@ -19,24 +19,24 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/channels-setup.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/channels-setup.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/completion.h>
|
||||
#include <irssip/src/fe-common/core/chat-completion.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/completion.h>
|
||||
#include <irssi/src/fe-common/core/chat-completion.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
|
||||
enum {
|
||||
COMPLETE_MCASE_NEVER = 0,
|
||||
|
|
|
|||
|
|
@ -19,15 +19,15 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/command-history.h>
|
||||
#include <irssi/src/fe-common/core/command-history.h>
|
||||
|
||||
/* command history */
|
||||
static GList *history_entries;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
|
||||
#define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
|
||||
|
||||
#include <irssip/src/common.h>
|
||||
#include <irssi/src/common.h>
|
||||
|
||||
typedef struct {
|
||||
char *name;
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/completion.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/completion.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
static GList *complist; /* list of commands we're currently completing */
|
||||
static char *last_line;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H
|
||||
#define IRSSI_FE_COMMON_CORE_COMPLETION_H
|
||||
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
|
||||
/* automatic word completion - called when space/enter is pressed */
|
||||
char *auto_word_complete(const char *line, int *pos);
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/fe-capsicum.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssi/src/fe-common/core/fe-capsicum.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
|
||||
static void capability_mode_enabled(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,27 +19,27 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/utf8.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/utf8.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/channels-setup.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/channels-setup.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/fe-channels.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/fe-channels.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,35 +19,35 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/args.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/args.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/fe-common/core/fe-core-commands.h>
|
||||
#include <irssip/src/fe-common/core/fe-queries.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/fe-common/core/fe-core-commands.h>
|
||||
#include <irssi/src/fe-common/core/fe-queries.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/fe-common/core/fe-capsicum.h>
|
||||
#include <irssi/src/fe-common/core/fe-capsicum.h>
|
||||
#endif
|
||||
#include <irssip/src/fe-common/core/hilight-text.h>
|
||||
#include <irssip/src/fe-common/core/command-history.h>
|
||||
#include <irssip/src/fe-common/core/completion.h>
|
||||
#include <irssip/src/fe-common/core/keyboard.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/formats.h>
|
||||
#include <irssip/src/fe-common/core/themes.h>
|
||||
#include <irssip/src/fe-common/core/fe-channels.h>
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-activity.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssip/src/fe-common/core/windows-layout.h>
|
||||
#include <irssip/src/fe-common/core/fe-recode.h>
|
||||
#include <irssi/src/fe-common/core/hilight-text.h>
|
||||
#include <irssi/src/fe-common/core/command-history.h>
|
||||
#include <irssi/src/fe-common/core/completion.h>
|
||||
#include <irssi/src/fe-common/core/keyboard.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/formats.h>
|
||||
#include <irssi/src/fe-common/core/themes.h>
|
||||
#include <irssi/src/fe-common/core/fe-channels.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-activity.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/windows-layout.h>
|
||||
#include <irssi/src/fe-common/core/fe-recode.h>
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,22 +18,22 @@
|
|||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <irssip/src/core/core.h>
|
||||
#include <irssi/src/core/core.h>
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/irssi-version.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/irssi-version.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#endif
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
#define PASTE_CHECK_SPEED 200 /* 0.2 sec */
|
||||
|
||||
|
|
|
|||
|
|
@ -19,24 +19,24 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/pidwait.h>
|
||||
#include <irssip/src/core/line-split.h>
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/net-sendbuffer.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/pidwait.h>
|
||||
#include <irssi/src/core/line-split.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/net-sendbuffer.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/fe-exec.h>
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/fe-exec.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H
|
||||
#define IRSSI_FE_COMMON_CORE_FE_EXEC_H
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
|
||||
#define EXEC_WI(query) \
|
||||
MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \
|
||||
|
|
@ -14,7 +14,7 @@ typedef struct PROCESS_REC PROCESS_REC;
|
|||
|
||||
#define STRUCT_SERVER_REC void
|
||||
typedef struct {
|
||||
#include <irssip/src/core/window-item-rec.h>
|
||||
#include <irssi/src/core/window-item-rec.h>
|
||||
PROCESS_REC *process;
|
||||
unsigned int destroying:1;
|
||||
} EXEC_WI_REC;
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/expandos.h>
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssi/src/core/expandos.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
|
||||
/* Nick column context variables */
|
||||
static char *current_nick = NULL;
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/formats.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/formats.h>
|
||||
|
||||
static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/ignore.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/ignore.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
|
||||
static void sig_message_public(SERVER_REC *server, const char *msg,
|
||||
const char *nick, const char *address,
|
||||
|
|
|
|||
|
|
@ -20,15 +20,15 @@
|
|||
|
||||
#include "module.h"
|
||||
#include <time.h>
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/ignore.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/ignore.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
static char *ignore_get_key(IGNORE_REC *rec)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,30 +19,30 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/log.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/log.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#ifdef HAVE_CAPSICUM
|
||||
#include <irssip/src/core/capsicum.h>
|
||||
#include <irssi/src/core/capsicum.h>
|
||||
#endif
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssip/src/fe-common/core/formats.h>
|
||||
#include <irssip/src/fe-common/core/themes.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/fe-common-core.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/formats.h>
|
||||
#include <irssi/src/fe-common/core/themes.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/fe-common-core.h>
|
||||
|
||||
#include <irssip/src/core/channels-setup.h>
|
||||
#include <irssi/src/core/channels-setup.h>
|
||||
|
||||
/* close autologs after 5 minutes of inactivity */
|
||||
#define AUTOLOG_INACTIVITY_CLOSE (60*5)
|
||||
|
|
|
|||
|
|
@ -19,23 +19,23 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/channels.h>
|
||||
#include <irssip/src/core/nicklist.h>
|
||||
#include <irssip/src/core/ignore.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/channels.h>
|
||||
#include <irssi/src/core/nicklist.h>
|
||||
#include <irssi/src/core/ignore.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssip/src/fe-common/core/fe-queries.h>
|
||||
#include <irssip/src/fe-common/core/hilight-text.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/fe-queries.h>
|
||||
#include <irssi/src/fe-common/core/hilight-text.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
/* Forward declarations for nick column functions */
|
||||
void update_nick_context(const char *nick, const char *mode);
|
||||
|
|
|
|||
|
|
@ -19,15 +19,15 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/modules-load.h>
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/modules-load.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
static void sig_module_error(void *number, const char *data,
|
||||
const char *rootmodule, const char *submodule)
|
||||
|
|
|
|||
|
|
@ -19,21 +19,21 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-core-commands.h>
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/fe-core-commands.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
static int queryclose_tag, query_auto_close, querycreate_level;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H
|
||||
#define IRSSI_FE_COMMON_CORE_FE_QUERIES_H
|
||||
|
||||
#include <irssip/src/core/queries.h>
|
||||
#include <irssi/src/core/queries.h>
|
||||
|
||||
/* Return query where to put the private message. */
|
||||
QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,
|
||||
|
|
|
|||
|
|
@ -19,15 +19,15 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/formats.h>
|
||||
#include <irssip/src/core/recode.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/formats.h>
|
||||
#include <irssi/src/core/recode.h>
|
||||
|
||||
static char *recode_fallback = NULL;
|
||||
static char *recode_out_default = NULL;
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/network.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/network.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/chat-protocols.h>
|
||||
#include <irssip/src/core/chatnets.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/servers-setup.h>
|
||||
#include <irssip/src/core/servers-reconnect.h>
|
||||
#include <irssi/src/core/chat-protocols.h>
|
||||
#include <irssi/src/core/chatnets.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/servers-setup.h>
|
||||
#include <irssi/src/core/servers-reconnect.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
static void print_servers(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/lib-config/iconfig.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/fe-common/core/fe-settings.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/keyboard.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/lib-config/iconfig.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/fe-settings.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/keyboard.h>
|
||||
|
||||
static void set_print(SETTINGS_REC *rec)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/tls.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/tls.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-tls.h>
|
||||
#include <irssi/src/fe-common/core/fe-tls.h>
|
||||
|
||||
static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,19 +19,19 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/modules.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/commands.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/modules.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/commands.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
|
||||
GSList *windows; /* first in the list is the active window,
|
||||
next is the last active, etc. */
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
|
||||
#define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
|
||||
|
||||
#include <irssip/src/core/window-item-def.h>
|
||||
#include <irssip/src/fe-common/core/command-history.h>
|
||||
#include <irssi/src/core/window-item-def.h>
|
||||
#include <irssi/src/fe-common/core/command-history.h>
|
||||
|
||||
enum {
|
||||
DATA_LEVEL_NONE = 0,
|
||||
|
|
|
|||
|
|
@ -19,23 +19,23 @@
|
|||
*/
|
||||
|
||||
#include "module.h"
|
||||
#include <irssip/src/fe-common/core/module-formats.h>
|
||||
#include <irssip/src/core/signals.h>
|
||||
#include <irssip/src/core/special-vars.h>
|
||||
#include <irssip/src/core/settings.h>
|
||||
#include <irssi/src/fe-common/core/module-formats.h>
|
||||
#include <irssi/src/core/signals.h>
|
||||
#include <irssi/src/core/special-vars.h>
|
||||
#include <irssi/src/core/settings.h>
|
||||
|
||||
#include <irssip/src/core/levels.h>
|
||||
#include <irssip/src/core/servers.h>
|
||||
#include <irssi/src/core/levels.h>
|
||||
#include <irssi/src/core/servers.h>
|
||||
|
||||
#include <irssip/src/fe-common/core/fe-windows.h>
|
||||
#include <irssip/src/fe-common/core/window-items.h>
|
||||
#include <irssip/src/fe-common/core/formats.h>
|
||||
#include <irssip/src/fe-common/core/themes.h>
|
||||
#include <irssip/src/fe-common/core/printtext.h>
|
||||
#include <irssip/src/core/recode.h>
|
||||
#include <irssip/src/core/utf8.h>
|
||||
#include <irssip/src/core/misc.h>
|
||||
#include <irssip/src/core/refstrings.h>
|
||||
#include <irssi/src/fe-common/core/fe-windows.h>
|
||||
#include <irssi/src/fe-common/core/window-items.h>
|
||||
#include <irssi/src/fe-common/core/formats.h>
|
||||
#include <irssi/src/fe-common/core/themes.h>
|
||||
#include <irssi/src/fe-common/core/printtext.h>
|
||||
#include <irssi/src/core/recode.h>
|
||||
#include <irssi/src/core/utf8.h>
|
||||
#include <irssi/src/core/misc.h>
|
||||
#include <irssi/src/core/refstrings.h>
|
||||
|
||||
static const char *format_backs = "04261537";
|
||||
static const char *format_fores = "kbgcrmyw";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue