zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-09 11:50:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Zmiana irssi -> irssip dla bezkonfliktowych testów

Browse source 
- Zmiana incdir z 'irssi' na 'irssip' w meson.build
- Zmiana nazwy binarja z 'irssi' na 'irssip'
- Zmiana katalogu config z ~/.irssi na ~/.irssip
- Aktualizacja wszystkich include paths z <irssi/> na <irssip/>
- Przywrócenie nazw plików źródłowych do oryginalnych 'irssi*'

Teraz może być instalowane w /opt/irssip bez konfliktów z systemowym irssi:
- Binarka: /opt/irssip/bin/irssip
- Konfiguracja: ~/.irssip/
- Moduły Perl: /opt/irssip/lib/irssip/perl/Irssi.pm
- Separacja modułów: systemowy irssi nie znajdzie naszych modułów w @INC
This commit is contained in:
kofany 2025-08-22 20:24:12 +02:00
commit 7bb2ee96ca
290 changed files with 1958 additions and 1958 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/fe-common/core/chat-completion.c
View file

@ -19,24 +19,24 @@
*/
#include "module.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/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/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/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/fe-common/core/completion.h>
#include <irssi/src/fe-common/core/chat-completion.h>
#include <irssi/src/fe-common/core/window-items.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>
enum {
COMPLETE_MCASE_NEVER = 0,

14
src/fe-common/core/command-history.c
View file

@ -19,15 +19,15 @@
*/
#include "module.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/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/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.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/command-history.h>
#include <irssip/src/fe-common/core/command-history.h>
/* command history */
static GList *history_entries;

2
src/fe-common/core/command-history.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
#define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
#include <irssi/src/common.h>
#include <irssip/src/common.h>
typedef struct {
char *name;

18
src/fe-common/core/completion.c
View file

@ -19,16 +19,16 @@
*/
#include "module.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/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/completion.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/completion.h>
#include <irssip/src/fe-common/core/printtext.h>
static GList *complist; /* list of commands we're currently completing */
static char *last_line;

2
src/fe-common/core/completion.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H
#define IRSSI_FE_COMMON_CORE_COMPLETION_H
#include <irssi/src/fe-common/core/window-items.h>
#include <irssip/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);

10
src/fe-common/core/fe-capsicum.c
View file

@ -23,11 +23,11 @@
*/
#include "module.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>
#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>
static void capability_mode_enabled(void)
{

38
src/fe-common/core/fe-channels.c
View file

@ -19,27 +19,27 @@
*/
#include "module.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/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/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/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/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>
#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>
static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
{

50
src/fe-common/core/fe-common-core.c
View file

@ -19,35 +19,35 @@
*/
#include "module.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/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/core/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/servers-setup.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/channels.h>
#include <irssip/src/core/servers-setup.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>
#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>
#ifdef HAVE_CAPSICUM
#include <irssi/src/fe-common/core/fe-capsicum.h>
#include <irssip/src/fe-common/core/fe-capsicum.h>
#endif
#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 <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 <signal.h>

24
src/fe-common/core/fe-core-commands.c
View file

@ -18,22 +18,22 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <irssi/src/core/core.h>
#include <irssip/src/core/core.h>
#include "module.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>
#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>
#ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h>
#include <irssip/src/core/capsicum.h>
#endif
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/printtext.h>
#define PASTE_CHECK_SPEED 200 /* 0.2 sec */

32
src/fe-common/core/fe-exec.c
View file

@ -19,24 +19,24 @@
*/
#include "module.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/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/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/queries.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/channels.h>
#include <irssip/src/core/queries.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 <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 <signal.h>
#include <stdlib.h>

4
src/fe-common/core/fe-exec.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H
#define IRSSI_FE_COMMON_CORE_FE_EXEC_H
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssip/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 <irssi/src/core/window-item-rec.h>
#include <irssip/src/core/window-item-rec.h>
PROCESS_REC *process;
unsigned int destroying:1;
} EXEC_WI_REC;

4
src/fe-common/core/fe-expandos.c
View file

@ -19,8 +19,8 @@
*/
#include "module.h"
#include <irssi/src/core/expandos.h>
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssip/src/core/expandos.h>
#include <irssip/src/fe-common/core/fe-windows.h>
/* Window ref# */
static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)

14
src/fe-common/core/fe-help.c
View file

@ -19,14 +19,14 @@
*/
#include "module.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/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/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/formats.h>
#include <irssip/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/formats.h>
static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
{

8
src/fe-common/core/fe-ignore-messages.c
View file

@ -19,10 +19,10 @@
*/
#include "module.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>
#include <irssip/src/core/signals.h>
#include <irssip/src/core/levels.h>
#include <irssip/src/core/ignore.h>
#include <irssip/src/core/servers.h>
static void sig_message_public(SERVER_REC *server, const char *msg,
const char *nick, const char *address,

16
src/fe-common/core/fe-ignore.c
View file

@ -20,15 +20,15 @@
#include "module.h"
#include <time.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/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/core/servers.h>
#include <irssi/src/core/ignore.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/ignore.h>
#include <irssip/src/fe-common/core/printtext.h>
static char *ignore_get_key(IGNORE_REC *rec)
{

40
src/fe-common/core/fe-log.c
View file

@ -19,30 +19,30 @@
*/
#include "module.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>
#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>
#ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h>
#include <irssip/src/core/capsicum.h>
#endif
#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/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/core/channels-setup.h>
#include <irssip/src/core/channels-setup.h>
/* close autologs after 5 minutes of inactivity */
#define AUTOLOG_INACTIVITY_CLOSE (60*5)

30
src/fe-common/core/fe-messages.c
View file

@ -19,23 +19,23 @@
*/
#include "module.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/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/core/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/nicklist.h>
#include <irssi/src/core/ignore.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/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>
#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>
#define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c))
#define isnickchar(a) \

16
src/fe-common/core/fe-modules.c
View file

@ -19,15 +19,15 @@
*/
#include "module.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/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/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/printtext.h>
static void sig_module_error(void *number, const char *data,
const char *rootmodule, const char *submodule)

26
src/fe-common/core/fe-queries.c
View file

@ -19,21 +19,21 @@
*/
#include "module.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/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/core/chat-protocols.h>
#include <irssi/src/core/servers.h>
#include <irssi/src/core/queries.h>
#include <irssip/src/core/chat-protocols.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/queries.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>
#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>
static int queryclose_tag, query_auto_close, querycreate_level;

2
src/fe-common/core/fe-queries.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H
#define IRSSI_FE_COMMON_CORE_FE_QUERIES_H
#include <irssi/src/core/queries.h>
#include <irssip/src/core/queries.h>
/* Return query where to put the private message. */
QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,

18
src/fe-common/core/fe-recode.c
View file

@ -19,15 +19,15 @@
*/
#include "module.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>
#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>
static char *recode_fallback = NULL;
static char *recode_out_default = NULL;

24
src/fe-common/core/fe-server.c
View file

@ -19,20 +19,20 @@
*/
#include "module.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/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/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/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/fe-common/core/module-formats.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/module-formats.h>
#include <irssip/src/fe-common/core/printtext.h>
static void print_servers(void)
{

22
src/fe-common/core/fe-settings.c
View file

@ -19,17 +19,17 @@
*/
#include "module.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>
#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>
static void set_print(SETTINGS_REC *rec)
{

14
src/fe-common/core/fe-tls.c
View file

@ -17,15 +17,15 @@
*/
#include "module.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/core/signals.h>
#include <irssip/src/core/settings.h>
#include <irssip/src/core/levels.h>
#include <irssip/src/core/tls.h>
#include <irssi/src/fe-common/core/module-formats.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/module-formats.h>
#include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/fe-tls.h>
#include <irssip/src/fe-common/core/fe-tls.h>
static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
{

22
src/fe-common/core/fe-windows.c
View file

@ -19,19 +19,19 @@
*/
#include "module.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/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/core/levels.h>
#include <irssip/src/core/levels.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>
#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>
GSList *windows; /* first in the list is the active window,
next is the last active, etc. */

4
src/fe-common/core/fe-windows.h
View file

@ -1,8 +1,8 @@
#ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
#define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
#include <irssi/src/core/window-item-def.h>
#include <irssi/src/fe-common/core/command-history.h>
#include <irssip/src/core/window-item-def.h>
#include <irssip/src/fe-common/core/command-history.h>
enum {
DATA_LEVEL_NONE = 0,

28
src/fe-common/core/formats.c
View file

@ -19,22 +19,22 @@
*/
#include "module.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/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/core/levels.h>
#include <irssi/src/core/servers.h>
#include <irssip/src/core/levels.h>
#include <irssip/src/core/servers.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/core/recode.h>
#include <irssi/src/core/utf8.h>
#include <irssi/src/core/misc.h>
#include <irssi/src/core/refstrings.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/core/recode.h>
#include <irssip/src/core/utf8.h>
#include <irssip/src/core/misc.h>
#include <irssip/src/core/refstrings.h>
static const char *format_backs = "04261537";
static const char *format_fores = "kbgcrmyw";

6
src/fe-common/core/formats.h
View file

@ -1,9 +1,9 @@
#ifndef IRSSI_FE_COMMON_CORE_FORMATS_H
#define IRSSI_FE_COMMON_CORE_FORMATS_H
#include <irssi/src/core/signals.h>
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/themes.h>
#include <irssip/src/core/signals.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/themes.h>
#define GUI_PRINT_FLAG_BOLD 0x0001
#define GUI_PRINT_FLAG_REVERSE 0x0002

30
src/fe-common/core/hilight-text.c
View file

@ -19,23 +19,23 @@
*/
#include "module.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 <irssi/src/core/iregex.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 <irssip/src/core/iregex.h>
#include <irssi/src/core/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/nicklist.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/channels.h>
#include <irssip/src/core/nicklist.h>
#include <irssi/src/fe-common/core/hilight-text.h>
#include <irssi/src/core/nickmatch-cache.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/formats.h>
#include <irssip/src/fe-common/core/hilight-text.h>
#include <irssip/src/core/nickmatch-cache.h>
#include <irssip/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/formats.h>
static NICKMATCH_REC *nickmatch;
static int never_hilight_level, default_hilight_level;

4
src/fe-common/core/hilight-text.h
View file

@ -1,8 +1,8 @@
#ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
#define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
#include <irssi/src/core/iregex.h>
#include <irssi/src/fe-common/core/formats.h>
#include <irssip/src/core/iregex.h>
#include <irssip/src/fe-common/core/formats.h>
struct _HILIGHT_REC {
char *text;

20
src/fe-common/core/keyboard.c
View file

@ -19,17 +19,17 @@
*/
#include "module.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/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/keyboard.h>
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/keyboard.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/printtext.h>
#define MAX_EXPAND_RECURSION 100

2
src/fe-common/core/keyboard.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H
#define IRSSI_FE_COMMON_CORE_KEYBOARD_H
#include <irssi/src/core/signals.h>
#include <irssip/src/core/signals.h>
typedef struct _KEYBOARD_REC KEYBOARD_REC;
typedef struct _KEYINFO_REC KEYINFO_REC;

2
src/fe-common/core/module-formats.c
View file

@ -19,7 +19,7 @@
*/
#include "module.h"
#include <irssi/src/fe-common/core/formats.h>
#include <irssip/src/fe-common/core/formats.h>
FORMAT_REC fecommon_core_formats[] = {
/* clang-format off */

2
src/fe-common/core/module-formats.h
View file

@ -1,4 +1,4 @@
#include <irssi/src/fe-common/core/formats.h>
#include <irssip/src/fe-common/core/formats.h>
enum {
TXT_MODULE_NAME,

4
src/fe-common/core/module.h
View file

@ -1,8 +1,8 @@
#include <irssi/src/common.h>
#include <irssip/src/common.h>
#define MODULE_NAME "fe-common/core"
#include <irssi/src/core/utf8.h>
#include <irssip/src/core/utf8.h>
typedef struct {
time_t time;
char *nick;

22
src/fe-common/core/printtext.c
View file

@ -19,19 +19,19 @@
*/
#include "module.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/settings.h>
#include <irssi/src/core/misc.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/settings.h>
#include <irssip/src/core/misc.h>
#include <irssi/src/core/levels.h>
#include <irssi/src/core/servers.h>
#include <irssip/src/core/levels.h>
#include <irssip/src/core/servers.h>
#include <irssi/src/fe-common/core/themes.h>
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/themes.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/printtext.h>
static int beep_msg_level, beep_msg_level_ignore, beep_when_away, beep_when_window_active;

4
src/fe-common/core/printtext.h
View file

@ -1,8 +1,8 @@
#ifndef IRSSI_FE_COMMON_CORE_PRINTTEXT_H
#define IRSSI_FE_COMMON_CORE_PRINTTEXT_H
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/formats.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/formats.h>
void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...);
void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);

20
src/fe-common/core/themes.c
View file

@ -19,17 +19,17 @@
*/
#include "module.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/lib-config/iconfig.h>
#include <irssi/src/core/settings.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/lib-config/iconfig.h>
#include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/themes.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/themes.h>
#include <irssip/src/fe-common/core/printtext.h>
#include "default-theme.h"

24
src/fe-common/core/window-activity.c
View file

@ -19,19 +19,19 @@
*/
#include "module.h"
#include <irssi/src/core/signals.h>
#include <irssi/src/core/levels.h>
#include <irssi/src/core/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/misc.h>
#include <irssi/src/core/settings.h>
#include <irssip/src/core/signals.h>
#include <irssip/src/core/levels.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/channels.h>
#include <irssip/src/core/misc.h>
#include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h>
#include <irssi/src/core/nicklist.h>
#include <irssi/src/fe-common/core/hilight-text.h>
#include <irssi/src/fe-common/core/formats.h>
#include <irssi/src/fe-common/core/fe-common-core.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/window-items.h>
#include <irssip/src/core/nicklist.h>
#include <irssip/src/fe-common/core/hilight-text.h>
#include <irssip/src/fe-common/core/formats.h>
#include <irssip/src/fe-common/core/fe-common-core.h>
static char **hide_targets;
static int hide_level, msg_level, hilight_level, signal_window_hilight_check;

26
src/fe-common/core/window-commands.c
View file

@ -19,21 +19,21 @@
*/
#include "module.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/misc.h>
#include <irssi/src/core/servers.h>
#include <irssi/src/core/settings.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/misc.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/settings.h>
#include <irssi/src/core/levels.h>
#include <irssip/src/core/levels.h>
#include <irssi/src/fe-common/core/themes.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/windows-layout.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/command-history.h>
#include <irssip/src/fe-common/core/themes.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/windows-layout.h>
#include <irssip/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/command-history.h>
static void window_print_binds(WINDOW_REC *win)
{

20
src/fe-common/core/window-items.c
View file

@ -19,18 +19,18 @@
*/
#include "module.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/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/settings.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/servers.h>
#include <irssip/src/core/channels.h>
#include <irssip/src/core/settings.h>
#include <irssi/src/core/levels.h>
#include <irssip/src/core/levels.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>
#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>
static void window_item_add_signal(WINDOW_REC *window, WI_ITEM_REC *item, int automatic, int send_signal)
{

2
src/fe-common/core/window-items.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H
#define IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H
#include <irssi/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/fe-windows.h>
/* Add/remove/destroy window item from `window' */
void window_item_add(WINDOW_REC *window, WI_ITEM_REC *item, int automatic);

28
src/fe-common/core/windows-layout.c
View file

@ -19,22 +19,22 @@
*/
#include "module.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 <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 <irssi/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h>
#include <irssi/src/core/channels.h>
#include <irssi/src/core/queries.h>
#include <irssip/src/core/chat-protocols.h>
#include <irssip/src/core/servers.h>
#include <irssip/src/core/channels.h>
#include <irssip/src/core/queries.h>
#include <irssi/src/fe-common/core/module-formats.h>
#include <irssi/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/themes.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/module-formats.h>
#include <irssip/src/fe-common/core/printtext.h>
#include <irssip/src/fe-common/core/themes.h>
#include <irssip/src/fe-common/core/fe-windows.h>
#include <irssip/src/fe-common/core/window-items.h>
static WINDOW_REC *restore_win;