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

Added keyboard_entry_redirect() function to keyboard.[ch] which sends

Browse source 
the signal "gui entry redirect" signal. Added possibility to keep the
entry hidden.

/OPER [<nick> [<password>]] - syntax changed. If password isn't given,
it's asked.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1063 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-04 18:01:51 +00:00 • committed by cras
commit 596ef586b2
8 changed files with 105 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@
#include "levels.h"
#include "printtext.h"
#include "keyboard.h"
static void set_print(SETTINGS_REC *rec)
{
@ -274,10 +275,9 @@ static void cmd_save(const char *data)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
IRCTXT_CONFIG_MODIFIED, data);
signal_emit("gui entry redirect", 4,
settings_save_confirm,
_("Overwrite config (y/N)?"),
GINT_TO_POINTER(FALSE), g_strdup(data));
keyboard_entry_redirect((SIGNAL_FUNC) settings_save_confirm,
_("Overwrite config (y/N)?"),
0, g_strdup(data));
}
void fe_settings_init(void)

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

@ -234,6 +234,13 @@ int key_pressed(const char *key, void *data)
return ret;
}
void keyboard_entry_redirect(SIGNAL_FUNC func, const char *entry,
int flags, void *data)
{
signal_emit("gui entry redirect", 4, func, entry,
GINT_TO_POINTER(flags), data);
}
static void sig_command(const char *data)
{
const char *cmdchars;

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

@ -29,6 +29,12 @@ void key_configure_remove(const char *key);
KEYINFO_REC *key_info_find(const char *id);
int key_pressed(const char *key, void *data);
#define ENTRY_REDIRECT_FLAG_HOTKEY 0x01
#define ENTRY_REDIRECT_FLAG_HIDDEN 0x02
void keyboard_entry_redirect(SIGNAL_FUNC func, const char *entry,
int flags, void *data);
void keyboard_init(void);
void keyboard_deinit(void);

47
src/fe-common/irc/fe-irc-commands.c
View file

@ -37,6 +37,7 @@
#include "fe-windows.h"
#include "window-items.h"
#include "printtext.h"
#include "keyboard.h"
/* SYNTAX: ME <message> */
static void cmd_me(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
@ -371,6 +372,50 @@ static void cmd_ts(const char *data)
}
}
typedef struct {
IRC_SERVER_REC *server;
char *nick;
} OPER_PASS_REC;
static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec)
{
if (*password != '\0')
irc_send_cmdv(rec->server, "OPER %s %s", rec->nick, password);
g_free(rec->nick);
g_free(rec);
}
/* SYNTAX: OPER [<nick> [<password>]] */
static void cmd_oper(const char *data, IRC_SERVER_REC *server)
{
char *nick, *password;
void *free_arg;
g_return_if_fail(data != NULL);
if (!IS_IRC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (!cmd_get_params(data, &free_arg, 2, &nick, &password))
return;
if (*password == '\0') {
/* password not given, ask it.
irc/core handles the /OPER when password is given */
OPER_PASS_REC *rec;
rec = g_new(OPER_PASS_REC, 1);
rec->server = server;
rec->nick = g_strdup(*nick != '\0' ? nick : server->nick);
keyboard_entry_redirect((SIGNAL_FUNC) cmd_oper_got_pass,
_("Operator password:"),
ENTRY_REDIRECT_FLAG_HIDDEN, rec);
signal_stop();
}
cmd_params_free(free_arg);
}
void fe_irc_commands_init(void)
{
command_bind_last("me", NULL, (SIGNAL_FUNC) cmd_me);
@ -386,6 +431,7 @@ void fe_irc_commands_init(void)
command_bind("ver", NULL, (SIGNAL_FUNC) cmd_ver);
command_bind("topic", NULL, (SIGNAL_FUNC) cmd_topic);
command_bind("ts", NULL, (SIGNAL_FUNC) cmd_ts);
command_bind("oper", NULL, (SIGNAL_FUNC) cmd_oper);
}
void fe_irc_commands_deinit(void)
@ -403,4 +449,5 @@ void fe_irc_commands_deinit(void)
command_unbind("ver", (SIGNAL_FUNC) cmd_ver);
command_unbind("topic", (SIGNAL_FUNC) cmd_topic);
command_unbind("ts", (SIGNAL_FUNC) cmd_ts);
command_unbind("oper", (SIGNAL_FUNC) cmd_oper);
}