mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-22 11:46:20 +00:00
Added current window reference to command functions
This commit is contained in:
James Booth
@@ -1859,7 +1859,7 @@ cmd_process_input(ProfWin *window, char *inp)
|
||||
|
||||
// call a default handler if input didn't start with '/'
|
||||
} else {
|
||||
result = cmd_execute_default(inp);
|
||||
result = cmd_execute_default(window, inp);
|
||||
}
|
||||
|
||||
return result;
|
||||
@@ -1888,7 +1888,7 @@ _cmd_execute(ProfWin *window, const char * const command, const char * const inp
|
||||
} else {
|
||||
gchar **tokens = g_strsplit(inp, " ", 2);
|
||||
char *field = tokens[0] + 1;
|
||||
result = cmd_form_field(field, args);
|
||||
result = cmd_form_field(window, field, args);
|
||||
g_strfreev(tokens);
|
||||
}
|
||||
|
||||
@@ -1905,7 +1905,7 @@ _cmd_execute(ProfWin *window, const char * const command, const char * const inp
|
||||
ui_invalid_command_usage(cmd->help.usage, cmd->setting_func);
|
||||
return TRUE;
|
||||
} else {
|
||||
gboolean result = cmd->func(args, cmd->help);
|
||||
gboolean result = cmd->func(window, args, cmd->help);
|
||||
g_strfreev(args);
|
||||
return result;
|
||||
}
|
||||
@@ -1913,7 +1913,7 @@ _cmd_execute(ProfWin *window, const char * const command, const char * const inp
|
||||
gboolean ran_alias = FALSE;
|
||||
gboolean alias_result = cmd_execute_alias(window, inp, &ran_alias);
|
||||
if (!ran_alias) {
|
||||
return cmd_execute_default(inp);
|
||||
return cmd_execute_default(window, inp);
|
||||
} else {
|
||||
return alias_result;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,7 @@ typedef struct cmd_help_t {
|
||||
*/
|
||||
typedef struct cmd_t {
|
||||
gchar *cmd;
|
||||
gboolean (*func)(gchar **args, struct cmd_help_t help);
|
||||
gboolean (*func)(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gchar** (*parser)(const char * const inp, int min, int max, gboolean *result);
|
||||
int min_args;
|
||||
int max_args;
|
||||
@@ -65,87 +65,87 @@ typedef struct cmd_t {
|
||||
} Command;
|
||||
|
||||
gboolean cmd_execute_alias(ProfWin *window, const char * const inp, gboolean *ran);
|
||||
gboolean cmd_execute_default(const char * inp);
|
||||
gboolean cmd_execute_default(ProfWin *window, const char * inp);
|
||||
|
||||
gboolean cmd_about(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_account(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_autoaway(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_autoconnect(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_autoping(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_away(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_beep(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_caps(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_chat(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_chlog(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_clear(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_close(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_connect(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_decline(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_disco(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_disconnect(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_dnd(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_flash(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_gone(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_grlog(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_group(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_help(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_history(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_carbons(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_receipts(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_info(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_intype(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_invite(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_invites(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_join(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_leave(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_log(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_mouse(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_msg(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_nick(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_notify(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_online(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_otr(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_outtype(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_prefs(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_priority(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_quit(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_reconnect(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_room(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_rooms(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_bookmark(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_roster(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_software(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_splash(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_states(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_status(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_statuses(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_sub(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_theme(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_tiny(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_titlebar(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_vercheck(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_who(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_win(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_wins(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_winstidy(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_xa(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_alias(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_xmlconsole(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_ping(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_form(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_occupants(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_kick(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_ban(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_subject(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_affiliation(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_role(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_privileges(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_presence(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_wrap(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_time(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_resource(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_inpblock(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_about(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_account(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_autoaway(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_autoconnect(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_autoping(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_away(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_beep(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_caps(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_chat(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_chlog(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_clear(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_close(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_connect(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_decline(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_disco(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_disconnect(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_dnd(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_flash(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_gone(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_grlog(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_group(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_help(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_history(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_carbons(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_receipts(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_info(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_intype(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_invite(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_invites(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_join(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_leave(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_log(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_mouse(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_msg(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_nick(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_notify(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_online(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_otr(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_outtype(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_prefs(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_priority(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_quit(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_reconnect(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_room(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_rooms(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_bookmark(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_roster(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_software(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_splash(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_states(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_status(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_statuses(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_sub(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_theme(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_tiny(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_titlebar(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_vercheck(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_who(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_win(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_wins(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_winstidy(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_xa(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_alias(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_xmlconsole(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_ping(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_form(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_occupants(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_kick(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_ban(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_subject(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_affiliation(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_role(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_privileges(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_presence(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_wrap(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_time(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_resource(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_inpblock(ProfWin *window, gchar **args, struct cmd_help_t help);
|
||||
|
||||
gboolean cmd_form_field(char *tag, gchar **args);
|
||||
gboolean cmd_form_field(ProfWin *window, char *tag, gchar **args);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -663,10 +663,9 @@ muc_roster_nick_change_complete(const char * const room,
|
||||
}
|
||||
|
||||
char *
|
||||
muc_autocomplete(const char * const input)
|
||||
muc_autocomplete(ProfWin *window, const char * const input)
|
||||
{
|
||||
win_type_t wintype = ui_current_win_type();
|
||||
if (wintype == WIN_MUC) {
|
||||
if (window->type == WIN_MUC) {
|
||||
ProfMucWin *mucwin = wins_get_current_muc();
|
||||
ChatRoom *chat_room = g_hash_table_lookup(rooms, mucwin->roomjid);
|
||||
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "contact.h"
|
||||
#include "jid.h"
|
||||
#include "tools/autocomplete.h"
|
||||
#include "ui/win_types.h"
|
||||
|
||||
typedef enum {
|
||||
MUC_ROLE_NONE,
|
||||
@@ -133,7 +134,7 @@ char* muc_subject(const char * const room);
|
||||
void muc_pending_broadcasts_add(const char * const room, const char * const message);
|
||||
GList * muc_pending_broadcasts(const char * const room);
|
||||
|
||||
char* muc_autocomplete(const char * const input);
|
||||
char* muc_autocomplete(ProfWin *window, const char * const input);
|
||||
void muc_autocomplete_reset(const char * const room);
|
||||
|
||||
gboolean muc_requires_config(const char * const room);
|
||||
|
||||
@@ -130,10 +130,10 @@ prof_handle_idle(void)
|
||||
void
|
||||
prof_handle_activity(void)
|
||||
{
|
||||
win_type_t win_type = ui_current_win_type();
|
||||
jabber_conn_status_t status = jabber_get_connection_status();
|
||||
ProfWin *current = wins_get_current();
|
||||
|
||||
if ((status == JABBER_CONNECTED) && (win_type == WIN_CHAT)) {
|
||||
if ((status == JABBER_CONNECTED) && (current->type == WIN_CHAT)) {
|
||||
ProfChatWin *chatwin = wins_get_current_chat();
|
||||
chat_state_handle_typing(chatwin->barejid, chatwin->state);
|
||||
}
|
||||
|
||||
@@ -1560,7 +1560,8 @@ cons_show_contacts(GSList *list)
|
||||
void
|
||||
cons_alert(void)
|
||||
{
|
||||
if (ui_current_win_type() != WIN_CONSOLE) {
|
||||
ProfWin *current = wins_get_current();
|
||||
if (current->type != WIN_CONSOLE) {
|
||||
status_bar_new(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -689,7 +689,8 @@ ui_invalid_command_usage(const char * const usage, void (*setting_func)(void))
|
||||
} else {
|
||||
cons_show("");
|
||||
cons_show("Usage: %s", usage);
|
||||
if (ui_current_win_type() == WIN_CHAT) {
|
||||
ProfWin *current = wins_get_current();
|
||||
if (current->type == WIN_CHAT) {
|
||||
char usage_cpy[strlen(usage) + 8];
|
||||
sprintf(usage_cpy, "Usage: %s", usage);
|
||||
ui_current_print_line(usage_cpy);
|
||||
@@ -1144,13 +1145,6 @@ ui_swap_wins(int source_win, int target_win)
|
||||
return wins_swap(source_win, target_win);
|
||||
}
|
||||
|
||||
win_type_t
|
||||
ui_current_win_type(void)
|
||||
{
|
||||
ProfWin *current = wins_get_current();
|
||||
return current->type;
|
||||
}
|
||||
|
||||
win_type_t
|
||||
ui_win_type(int index)
|
||||
{
|
||||
|
||||
@@ -436,8 +436,9 @@ _inp_rl_tab_handler(int count, int key)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ((strncmp(rl_line_buffer, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) {
|
||||
char *result = muc_autocomplete(rl_line_buffer);
|
||||
ProfWin *current = wins_get_current();
|
||||
if ((strncmp(rl_line_buffer, "/", 1) != 0) && (current->type == WIN_MUC)) {
|
||||
char *result = muc_autocomplete(current, rl_line_buffer);
|
||||
if (result) {
|
||||
rl_replace_line(result, 0);
|
||||
rl_point = rl_end;
|
||||
|
||||
111
src/ui/ui.h
111
src/ui/ui.h
@@ -35,122 +35,15 @@
|
||||
#ifndef UI_UI_H
|
||||
#define UI_UI_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <wchar.h>
|
||||
#include <glib.h>
|
||||
#ifdef HAVE_NCURSESW_NCURSES_H
|
||||
#include <ncursesw/ncurses.h>
|
||||
#elif HAVE_NCURSES_H
|
||||
#include <ncurses.h>
|
||||
#endif
|
||||
|
||||
#include "contact.h"
|
||||
#include "jid.h"
|
||||
#include "xmpp/xmpp.h"
|
||||
#include "ui/buffer.h"
|
||||
#include "chat_state.h"
|
||||
#include "ui/win_types.h"
|
||||
#include "muc.h"
|
||||
|
||||
#define LAYOUT_SPLIT_MEMCHECK 12345671
|
||||
#define PROFCHATWIN_MEMCHECK 22374522
|
||||
#define PROFMUCWIN_MEMCHECK 52345276
|
||||
#define PROFPRIVATEWIN_MEMCHECK 77437483
|
||||
#define PROFCONFWIN_MEMCHECK 64334685
|
||||
#define PROFXMLWIN_MEMCHECK 87333463
|
||||
|
||||
#define NO_ME 1
|
||||
#define NO_DATE 2
|
||||
#define NO_EOL 4
|
||||
#define NO_COLOUR_FROM 8
|
||||
#define NO_COLOUR_DATE 16
|
||||
|
||||
typedef enum {
|
||||
LAYOUT_SIMPLE,
|
||||
LAYOUT_SPLIT
|
||||
} layout_type_t;
|
||||
|
||||
typedef struct prof_layout_t {
|
||||
layout_type_t type;
|
||||
WINDOW *win;
|
||||
ProfBuff buffer;
|
||||
int y_pos;
|
||||
int paged;
|
||||
} ProfLayout;
|
||||
|
||||
typedef struct prof_layout_simple_t {
|
||||
ProfLayout base;
|
||||
} ProfLayoutSimple;
|
||||
|
||||
typedef struct prof_layout_split_t {
|
||||
ProfLayout base;
|
||||
WINDOW *subwin;
|
||||
int sub_y_pos;
|
||||
unsigned long memcheck;
|
||||
} ProfLayoutSplit;
|
||||
|
||||
typedef enum {
|
||||
WIN_CONSOLE,
|
||||
WIN_CHAT,
|
||||
WIN_MUC,
|
||||
WIN_MUC_CONFIG,
|
||||
WIN_PRIVATE,
|
||||
WIN_XML
|
||||
} win_type_t;
|
||||
|
||||
typedef enum {
|
||||
PROF_ENC_NONE,
|
||||
PROF_ENC_OTR
|
||||
} prof_enc_t;
|
||||
|
||||
typedef struct prof_win_t {
|
||||
win_type_t type;
|
||||
ProfLayout *layout;
|
||||
} ProfWin;
|
||||
|
||||
typedef struct prof_console_win_t {
|
||||
ProfWin window;
|
||||
} ProfConsoleWin;
|
||||
|
||||
typedef struct prof_chat_win_t {
|
||||
ProfWin window;
|
||||
char *barejid;
|
||||
int unread;
|
||||
ChatState *state;
|
||||
prof_enc_t enc_mode;
|
||||
gboolean otr_is_trusted;
|
||||
char *resource_override;
|
||||
gboolean history_shown;
|
||||
unsigned long memcheck;
|
||||
} ProfChatWin;
|
||||
|
||||
typedef struct prof_muc_win_t {
|
||||
ProfWin window;
|
||||
char *roomjid;
|
||||
int unread;
|
||||
gboolean showjid;
|
||||
unsigned long memcheck;
|
||||
} ProfMucWin;
|
||||
|
||||
typedef struct prof_mucconf_win_t {
|
||||
ProfWin window;
|
||||
char *roomjid;
|
||||
DataForm *form;
|
||||
unsigned long memcheck;
|
||||
} ProfMucConfWin;
|
||||
|
||||
typedef struct prof_private_win_t {
|
||||
ProfWin window;
|
||||
char *fulljid;
|
||||
int unread;
|
||||
unsigned long memcheck;
|
||||
} ProfPrivateWin;
|
||||
|
||||
typedef struct prof_xml_win_t {
|
||||
ProfWin window;
|
||||
unsigned long memcheck;
|
||||
} ProfXMLWin;
|
||||
|
||||
// ui startup and control
|
||||
void ui_init(void);
|
||||
void ui_load_colours(void);
|
||||
@@ -193,8 +86,6 @@ int ui_close_all_wins(void);
|
||||
int ui_close_read_wins(void);
|
||||
|
||||
// current window actions
|
||||
win_type_t ui_current_win_type(void);
|
||||
|
||||
void ui_current_print_line(const char * const msg, ...);
|
||||
void ui_current_print_formatted_line(const char show_char, int attrs, const char * const msg, ...);
|
||||
void ui_current_error_line(const char * const msg);
|
||||
|
||||
145
src/ui/win_types.h
Normal file
145
src/ui/win_types.h
Normal file
@@ -0,0 +1,145 @@
|
||||
/*
|
||||
* win_types.h
|
||||
*
|
||||
* Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
|
||||
*
|
||||
* This file is part of Profanity.
|
||||
*
|
||||
* Profanity 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Profanity 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 Profanity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In addition, as a special exception, the copyright holders give permission to
|
||||
* link the code of portions of this program with the OpenSSL library under
|
||||
* certain conditions as described in each individual source file, and
|
||||
* distribute linked combinations including the two.
|
||||
*
|
||||
* You must obey the GNU General Public License in all respects for all of the
|
||||
* code used other than OpenSSL. If you modify file(s) with this exception, you
|
||||
* may extend this exception to your version of the file(s), but you are not
|
||||
* obligated to do so. If you do not wish to do so, delete this exception
|
||||
* statement from your version. If you delete this exception statement from all
|
||||
* source files in the program, then also delete it here.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef UI_WIN_TYPES_H
|
||||
#define UI_WIN_TYPES_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <wchar.h>
|
||||
#include <glib.h>
|
||||
#ifdef HAVE_NCURSESW_NCURSES_H
|
||||
#include <ncursesw/ncurses.h>
|
||||
#elif HAVE_NCURSES_H
|
||||
#include <ncurses.h>
|
||||
#endif
|
||||
|
||||
#include "xmpp/xmpp.h"
|
||||
#include "ui/buffer.h"
|
||||
#include "chat_state.h"
|
||||
|
||||
#define LAYOUT_SPLIT_MEMCHECK 12345671
|
||||
#define PROFCHATWIN_MEMCHECK 22374522
|
||||
#define PROFMUCWIN_MEMCHECK 52345276
|
||||
#define PROFPRIVATEWIN_MEMCHECK 77437483
|
||||
#define PROFCONFWIN_MEMCHECK 64334685
|
||||
#define PROFXMLWIN_MEMCHECK 87333463
|
||||
|
||||
typedef enum {
|
||||
LAYOUT_SIMPLE,
|
||||
LAYOUT_SPLIT
|
||||
} layout_type_t;
|
||||
|
||||
typedef struct prof_layout_t {
|
||||
layout_type_t type;
|
||||
WINDOW *win;
|
||||
ProfBuff buffer;
|
||||
int y_pos;
|
||||
int paged;
|
||||
} ProfLayout;
|
||||
|
||||
typedef struct prof_layout_simple_t {
|
||||
ProfLayout base;
|
||||
} ProfLayoutSimple;
|
||||
|
||||
typedef struct prof_layout_split_t {
|
||||
ProfLayout base;
|
||||
WINDOW *subwin;
|
||||
int sub_y_pos;
|
||||
unsigned long memcheck;
|
||||
} ProfLayoutSplit;
|
||||
|
||||
typedef enum {
|
||||
WIN_CONSOLE,
|
||||
WIN_CHAT,
|
||||
WIN_MUC,
|
||||
WIN_MUC_CONFIG,
|
||||
WIN_PRIVATE,
|
||||
WIN_XML
|
||||
} win_type_t;
|
||||
|
||||
typedef enum {
|
||||
PROF_ENC_NONE,
|
||||
PROF_ENC_OTR
|
||||
} prof_enc_t;
|
||||
|
||||
typedef struct prof_win_t {
|
||||
win_type_t type;
|
||||
ProfLayout *layout;
|
||||
} ProfWin;
|
||||
|
||||
typedef struct prof_console_win_t {
|
||||
ProfWin window;
|
||||
} ProfConsoleWin;
|
||||
|
||||
typedef struct prof_chat_win_t {
|
||||
ProfWin window;
|
||||
char *barejid;
|
||||
int unread;
|
||||
ChatState *state;
|
||||
prof_enc_t enc_mode;
|
||||
gboolean otr_is_trusted;
|
||||
char *resource_override;
|
||||
gboolean history_shown;
|
||||
unsigned long memcheck;
|
||||
} ProfChatWin;
|
||||
|
||||
typedef struct prof_muc_win_t {
|
||||
ProfWin window;
|
||||
char *roomjid;
|
||||
int unread;
|
||||
gboolean showjid;
|
||||
unsigned long memcheck;
|
||||
} ProfMucWin;
|
||||
|
||||
typedef struct prof_mucconf_win_t {
|
||||
ProfWin window;
|
||||
char *roomjid;
|
||||
DataForm *form;
|
||||
unsigned long memcheck;
|
||||
} ProfMucConfWin;
|
||||
|
||||
typedef struct prof_private_win_t {
|
||||
ProfWin window;
|
||||
char *fulljid;
|
||||
int unread;
|
||||
unsigned long memcheck;
|
||||
} ProfPrivateWin;
|
||||
|
||||
typedef struct prof_xml_win_t {
|
||||
ProfWin window;
|
||||
unsigned long memcheck;
|
||||
} ProfXMLWin;
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user