aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

Add capability mode error/success messages.

Browse Source 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
This commit is contained in:
Edward Tomasz Napierala 2017-07-26 01:00:25 +01:00
parent 56c94570b4
commit d5d45c29b8
7 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/capsicum.c
View File

@ -30,17 +30,37 @@ static void cmd_cap_enter(void)
int error;
error = cap_enter();
if (error != 0)
g_error("cap_enter(2) failed: %s", strerror(errno));
if (error != 0) {
signal_emit("capability mode failed", 1, strerror(errno));
} else {
signal_emit("capability mode enabled", 0);
}
}
static void cmd_cap_getmode(void)
{
u_int mode;
int error;
error = cap_getmode(&mode);
if (error != 0) {
signal_emit("capability mode failed", 1, strerror(errno));
} else if (mode == 0) {
signal_emit("capability mode disabled", 0);
} else {
signal_emit("capability mode enabled", 0);
}
}
void capsicum_init(void)
{
command_bind("cap_enter", NULL, (SIGNAL_FUNC) cmd_cap_enter);
command_bind("cap_getmode", NULL, (SIGNAL_FUNC) cmd_cap_getmode);
}
void capsicum_deinit(void)
{
command_unbind("cap_enter", (SIGNAL_FUNC) cmd_cap_enter);
command_unbind("cap_getmode", (SIGNAL_FUNC) cmd_cap_getmode);
}

5
src/fe-common/core/Makefile.am
View File

@ -38,6 +38,11 @@ libfe_common_core_a_SOURCES = \
windows-layout.c \
fe-windows.c
if HAVE_CAPSICUM
libfe_common_core_a_SOURCES += \
fe-capsicum.c
endif
pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core
pkginc_fe_common_core_HEADERS = \
command-history.h \

60
src/fe-common/core/fe-capsicum.c Normal file
View File

@ -0,0 +1,60 @@
/*
fe-capsicum.c : irssi
Copyright (C) 2017 Edward Tomasz Napierala <trasz@FreeBSD.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "module.h"
#include "module-formats.h"
#include "signals.h"
#include "printtext.h"
#include "levels.h"
#include "servers.h"
static void capability_mode_enabled(void)
{
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_CAPSICUM_ENABLED);
}
static void capability_mode_disabled(void)
{
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_CAPSICUM_DISABLED);
}
static void capability_mode_failed(gchar *msg)
{
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_CAPSICUM_FAILED, msg);
}
void fe_capsicum_init(void)
{
signal_add("capability mode enabled", (SIGNAL_FUNC) capability_mode_enabled);
signal_add("capability mode disabled", (SIGNAL_FUNC) capability_mode_disabled);
signal_add("capability mode failed", (SIGNAL_FUNC) capability_mode_failed);
}
void fe_capsicum_deinit(void)
{
signal_remove("capability mode enabled", (SIGNAL_FUNC) capability_mode_enabled);
signal_remove("capability mode disabled", (SIGNAL_FUNC) capability_mode_disabled);
signal_remove("capability mode failed", (SIGNAL_FUNC) capability_mode_failed);
}

7
src/fe-common/core/fe-capsicum.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef __FE_CAPSICUM_H
#define __FE_CAPSICUM_H
void fe_capsicum_init(void);
void fe_capsicum_deinit(void);
#endif

3
src/fe-common/core/fe-common-core.c
View File

@ -32,6 +32,7 @@
#include "special-vars.h"
#include "fe-core-commands.h"
#include "fe-queries.h"
#include "fe-capsicum.h"
#include "hilight-text.h"
#include "command-history.h"
#include "completion.h"
@ -179,6 +180,7 @@ void fe_common_core_init(void)
fe_server_init();
fe_settings_init();
fe_tls_init();
fe_capsicum_init();
windows_init();
window_activity_init();
window_commands_init();
@ -221,6 +223,7 @@ void fe_common_core_deinit(void)
fe_server_deinit();
fe_settings_deinit();
fe_tls_deinit();
fe_capsicum_deinit();
windows_deinit();
window_activity_deinit();
window_commands_deinit();

3
src/fe-common/core/module-formats.c
View File

@ -290,6 +290,9 @@ FORMAT_REC fecommon_core_formats[] = {
{ "completion_header", "%#Key Value Auto", 0 },
{ "completion_line", "%#$[10]0 $[!40]1 $2", 3, { 0, 0, 0 } },
{ "completion_footer", "", 0 },
{ "capsicum_enabled", "Capability mode enabled", 0 },
{ "capsicum_disabled", "Capability mode not enabled", 0 },
{ "capsicum_failed", "Capability mode failed: $0", 1, { 0 } },
/* ---- */
{ NULL, "TLS", 0 },

3
src/fe-common/core/module-formats.h
View File

@ -255,6 +255,9 @@ enum {
TXT_COMPLETION_HEADER,
TXT_COMPLETION_LINE,
TXT_COMPLETION_FOOTER,
TXT_CAPSICUM_ENABLED,
TXT_CAPSICUM_DISABLED,
TXT_CAPSICUM_FAILED,
TLS_FILL_15,