summaryrefslogtreecommitdiff
path: root/src/fe-text
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe-text')
-rw-r--r--src/fe-text/gui-readline.c2
-rw-r--r--src/fe-text/gui-special-vars.c6
-rw-r--r--src/fe-text/gui-textwidget.c2
-rw-r--r--src/fe-text/gui-windows.c5
-rw-r--r--src/fe-text/gui-windows.h2
-rw-r--r--src/fe-text/irssi.c2
-rw-r--r--src/fe-text/statusbar-items.c16
-rw-r--r--src/fe-text/statusbar.c2
8 files changed, 17 insertions, 20 deletions
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 51f763bb..22d1fb19 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -20,7 +20,7 @@
#include "module.h"
#include "signals.h"
-#include "server.h"
+#include "servers.h"
#include "misc.h"
#include "completion.h"
diff --git a/src/fe-text/gui-special-vars.c b/src/fe-text/gui-special-vars.c
index f0a66727..df936c84 100644
--- a/src/fe-text/gui-special-vars.c
+++ b/src/fe-text/gui-special-vars.c
@@ -25,7 +25,7 @@
#include "gui-readline.h"
/* idle time */
-static char *expando_idletime(void *server, void *item, int *free_ret)
+static char *expando_idletime(SERVER_REC *server, void *item, int *free_ret)
{
int diff;
@@ -35,13 +35,13 @@ static char *expando_idletime(void *server, void *item, int *free_ret)
}
/* current contents of the input line */
-static char *expando_inputline(void *server, void *item, int *free_ret)
+static char *expando_inputline(SERVER_REC *server, void *item, int *free_ret)
{
return gui_entry_get_text();
}
/* FIXME: value of cutbuffer */
-static char *expando_cutbuffer(void *server, void *item, int *free_ret)
+static char *expando_cutbuffer(SERVER_REC *server, void *item, int *free_ret)
{
return cutbuffer;
}
diff --git a/src/fe-text/gui-textwidget.c b/src/fe-text/gui-textwidget.c
index f3604260..9b16e691 100644
--- a/src/fe-text/gui-textwidget.c
+++ b/src/fe-text/gui-textwidget.c
@@ -26,7 +26,7 @@
#include "levels.h"
#include "settings.h"
-#include "irc-server.h"
+#include "irc-servers.h"
#include "windows.h"
#include "screen.h"
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index b905684c..8e915454 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -21,7 +21,7 @@
#include "module.h"
#include "signals.h"
#include "commands.h"
-#include "server.h"
+#include "servers.h"
#include "misc.h"
#include "settings.h"
@@ -244,9 +244,6 @@ void gui_window_newline(GUI_WINDOW_REC *gui, int visible)
scrollok(gui->parent->curses_win, TRUE);
wscrl(gui->parent->curses_win, 1);
scrollok(gui->parent->curses_win, FALSE);
-
- wmove(gui->parent->curses_win, gui->parent->lines, 0);
- wclrtoeol(gui->parent->curses_win);
}
}
diff --git a/src/fe-text/gui-windows.h b/src/fe-text/gui-windows.h
index ecadd775..6304a05d 100644
--- a/src/fe-text/gui-windows.h
+++ b/src/fe-text/gui-windows.h
@@ -1,7 +1,7 @@
#ifndef __GUI_WINDOWS_H
#define __GUI_WINDOWS_H
-#include "server.h"
+#include "servers.h"
#include "mainwindows.h"
#define WINDOW_GUI(a) ((GUI_WINDOW_REC *) ((a)->gui_data))
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 53a48dcc..ec7f979a 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -88,7 +88,7 @@ static void textui_init(void)
fe_common_core_init();
fe_common_irc_init();
- theme_register(gui_text_formats);
+ theme_register(gui_text_formats);
signal_add("gui exit", (SIGNAL_FUNC) sig_exit);
}
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index d4759401..ca1342ef 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -20,14 +20,14 @@
#include "module.h"
#include "signals.h"
-#include "server.h"
+#include "servers.h"
#include "misc.h"
#include "settings.h"
#include "irc.h"
#include "channels.h"
-#include "query.h"
-#include "irc-server.h"
+#include "queries.h"
+#include "irc-servers.h"
#include "nicklist.h"
#include "windows.h"
@@ -150,7 +150,7 @@ static void statusbar_nick(SBAR_ITEM_REC *item, int ypos)
strncpy(nick, server->nick, 9);
nick[9] = '\0';
- channel = irc_item_channel(active_win->active);
+ channel = CHANNEL(active_win->active);
nickrec = channel == NULL ? NULL : nicklist_find(channel, server->nick);
}
@@ -224,7 +224,7 @@ static void statusbar_channel(SBAR_ITEM_REC *item, int ypos)
ltoa(winnum, window == NULL ? 0 : window->refnum);
- witem = window != NULL && irc_item_check(window->active) ?
+ witem = window != NULL && (IS_CHANNEL(window->active) || IS_QUERY(window->active)) ?
window->active : NULL;
if (witem == NULL)
{
@@ -242,7 +242,7 @@ static void statusbar_channel(SBAR_ITEM_REC *item, int ypos)
strncpy(channame, tmpname, 20); channame[20] = '\0';
g_free(tmpname);
- channel = irc_item_channel(witem);
+ channel = CHANNEL(witem);
if (channel == NULL) {
mode_size = 0;
} else {
@@ -681,8 +681,8 @@ static void statusbar_topic(SBAR_ITEM_REC *item, int ypos)
return;
topic = NULL;
- channel = irc_item_channel(active_win->active);
- query = irc_item_query(active_win->active);
+ channel = CHANNEL(active_win->active);
+ query = QUERY(active_win->active);
if (channel != NULL && channel->topic != NULL) topic = channel->topic;
if (query != NULL && query->address != NULL) topic = query->address;
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index efaa7f59..53501067 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -20,7 +20,7 @@
#include "module.h"
#include "signals.h"
-#include "server.h"
+#include "servers.h"
#include "settings.h"
#include "windows.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-17 19:53:50 +0000