aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Merge branch 'glib'

Browse Source 
Conflicts:
	command.c
This commit is contained in:
James Booth 2012-04-26 23:37:54 +01:00
commit 887278b91b
8 changed files with 38 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,9 +1,9 @@
CC = gcc CC = gcc
WARNS = -Werror -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-variable WARNS = -Werror -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-variable
LIBS = -lxml2 -lexpat -lssl -lresolv -lncurses -L ~/lib -lstrophe LIBS = -lxml2 -lexpat -lssl -lresolv -lncurses -L ~/lib -lstrophe `pkg-config --libs glib-2.0`
TESTLIB = -L ~/lib -l headunit TESTLIB = -L ~/lib -l headunit
CPPLIB = -lstdc++ CPPLIB = -lstdc++
CFLAGS = -I ~/include -O3 $(WARNS) $(LIBS) CFLAGS = -I ~/include -O3 $(WARNS) $(LIBS) `pkg-config --cflags glib-2.0`
OBJS = log.o windows.o title_bar.o status_bar.o input_win.o jabber.o \ OBJS = log.o windows.o title_bar.o status_bar.o input_win.o jabber.o \
profanity.o util.o command.o history.o contact_list.o main.o profanity.o util.o command.o history.o contact_list.o main.o
TESTOBJS = test_history.o history.o test_contact_list.o contact_list.o \ TESTOBJS = test_history.o history.o test_contact_list.o contact_list.o \

60
command.c
View File

@ -22,7 +22,9 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <ncurses.h>
#include <glib.h>
#include "command.h" #include "command.h"
#include "contact_list.h" #include "contact_list.h"
#include "history.h" #include "history.h"
@ -30,21 +32,24 @@
#include "windows.h" #include "windows.h"
#include "util.h" #include "util.h"
static int _handle_command(const char * const command, const char * const inp); static gboolean _handle_command(const char * const command,
static int _cmd_quit(void); const char * const inp);
static int _cmd_help(void); static gboolean _cmd_quit(void);
static int _cmd_who(void); static gboolean _cmd_help(void);
static int _cmd_ros(void); static gboolean _cmd_who(void);
static int _cmd_connect(const char * const inp); static gboolean _cmd_ros(void);
static int _cmd_msg(const char * const inp); static gboolean _cmd_connect(const char * const inp);
static int _cmd_close(const char * const inp); static gboolean _cmd_msg(const char * const inp);
static int _cmd_set_beep(const char * const inp); static gboolean _cmd_close(const char * const inp);
static int _cmd_set_flash(const char * const inp); static gboolean _cmd_set_beep(const char * const inp);
static int _cmd_default(const char * const inp); static gboolean _cmd_set_flash(const char * const inp);
static gboolean _cmd_default(const char * const inp);
int process_input(char *inp) gboolean process_input(char *inp)
{ {
int result = FALSE; gboolean result = FALSE;
g_strstrip(inp);
if (strlen(inp) > 0) if (strlen(inp) > 0)
history_append(inp); history_append(inp);
@ -52,7 +57,6 @@ int process_input(char *inp)
if (strlen(inp) == 0) { if (strlen(inp) == 0) {
result = TRUE; result = TRUE;
} else if (inp[0] == '/') { } else if (inp[0] == '/') {
inp = trim(inp);
char inp_cpy[strlen(inp) + 1]; char inp_cpy[strlen(inp) + 1];
strcpy(inp_cpy, inp); strcpy(inp_cpy, inp);
char *command = strtok(inp_cpy, " "); char *command = strtok(inp_cpy, " ");
@ -68,9 +72,9 @@ int process_input(char *inp)
return result; return result;
} }
static int _handle_command(const char * const command, const char * const inp) static gboolean _handle_command(const char * const command, const char * const inp)
{ {
int result = FALSE; gboolean result = FALSE;
if (strcmp(command, "/quit") == 0) { if (strcmp(command, "/quit") == 0) {
result = _cmd_quit(); result = _cmd_quit();
@ -97,9 +101,9 @@ static int _handle_command(const char * const command, const char * const inp)
return result; return result;
} }
static int _cmd_connect(const char * const inp) static gboolean _cmd_connect(const char * const inp)
{ {
int result = FALSE; gboolean result = FALSE;
jabber_status_t conn_status = jabber_connection_status(); jabber_status_t conn_status = jabber_connection_status();
if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) { if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) {
@ -130,19 +134,19 @@ static int _cmd_connect(const char * const inp)
return result; return result;
} }
static int _cmd_quit(void) static gboolean _cmd_quit(void)
{ {
return FALSE; return FALSE;
} }
static int _cmd_help(void) static gboolean _cmd_help(void)
{ {
cons_help(); cons_help();
return TRUE; return TRUE;
} }
static int _cmd_ros(void) static gboolean _cmd_ros(void)
{ {
jabber_status_t conn_status = jabber_connection_status(); jabber_status_t conn_status = jabber_connection_status();
@ -154,7 +158,7 @@ static int _cmd_ros(void)
return TRUE; return TRUE;
} }
static int _cmd_who(void) static gboolean _cmd_who(void)
{ {
jabber_status_t conn_status = jabber_connection_status(); jabber_status_t conn_status = jabber_connection_status();
@ -168,7 +172,7 @@ static int _cmd_who(void)
return TRUE; return TRUE;
} }
static int _cmd_msg(const char * const inp) static gboolean _cmd_msg(const char * const inp)
{ {
char *usr = NULL; char *usr = NULL;
char *msg = NULL; char *msg = NULL;
@ -202,7 +206,7 @@ static int _cmd_msg(const char * const inp)
return TRUE; return TRUE;
} }
static int _cmd_close(const char * const inp) static gboolean _cmd_close(const char * const inp)
{ {
if (!win_close_win()) if (!win_close_win())
cons_bad_command(inp); cons_bad_command(inp);
@ -210,7 +214,7 @@ static int _cmd_close(const char * const inp)
return TRUE; return TRUE;
} }
static int _cmd_set_beep(const char * const inp) static gboolean _cmd_set_beep(const char * const inp)
{ {
if (strcmp(inp, "/beep on") == 0) { if (strcmp(inp, "/beep on") == 0) {
cons_show("Sound enabled."); cons_show("Sound enabled.");
@ -225,7 +229,7 @@ static int _cmd_set_beep(const char * const inp)
return TRUE; return TRUE;
} }
static int _cmd_set_flash(const char * const inp) static gboolean _cmd_set_flash(const char * const inp)
{ {
if (strcmp(inp, "/flash on") == 0) { if (strcmp(inp, "/flash on") == 0) {
cons_show("Screen flash enabled."); cons_show("Screen flash enabled.");
@ -240,7 +244,7 @@ static int _cmd_set_flash(const char * const inp)
return TRUE; return TRUE;
} }
static int _cmd_default(const char * const inp) static gboolean _cmd_default(const char * const inp)
{ {
if (win_in_chat()) { if (win_in_chat()) {
char *recipient = win_get_recipient(); char *recipient = win_get_recipient();

2
command.h
View File

@ -24,6 +24,6 @@
#define COMMAND_H #define COMMAND_H
void cmd_init(void); void cmd_init(void);
int process_input(char *inp); gboolean process_input(char *inp);
#endif #endif

1
main.c
View File

@ -47,7 +47,6 @@ int main(int argc, char **argv)
profanity_init(disable_tls); profanity_init(disable_tls);
profanity_run(); profanity_run();
//profanity_shutdown();
return 0; return 0;
} }

5
profanity.c
View File

@ -22,8 +22,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <glib.h>
#include <ncurses.h>
#include "profanity.h" #include "profanity.h"
#include "log.h" #include "log.h"
@ -36,7 +35,7 @@ static void _profanity_shutdown(void);
void profanity_run(void) void profanity_run(void)
{ {
int cmd_result = TRUE; gboolean cmd_result = TRUE;
inp_non_block(); inp_non_block();
while(cmd_result == TRUE) { while(cmd_result == TRUE) {

1
test_util.c
View File

@ -1,4 +1,5 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <head-unit.h> #include <head-unit.h>
#include "util.h" #include "util.h"

19
util.c
View File

@ -36,25 +36,6 @@ void get_time(char *thetime)
strftime(thetime, 80, "%H:%M", timeinfo); strftime(thetime, 80, "%H:%M", timeinfo);
} }
char *trim(char *str)
{
char *end;
while (isspace(*str))
str++;
if (*str == 0)
return str;
end = str + strlen(str) - 1;
while (end > str && isspace(*end))
end--;
*(end+1) = 0;
return str;
}
char * str_replace (const char *string, const char *substr, char * str_replace (const char *string, const char *substr,
const char *replacement) { const char *replacement) {
char *tok = NULL; char *tok = NULL;

1
util.h
View File

@ -24,7 +24,6 @@
#define UTIL_H #define UTIL_H
void get_time(char *thetime); void get_time(char *thetime);
char * trim(char *str);
char * str_replace(const char *string, const char *substr, char * str_replace(const char *string, const char *substr,
const char *replacement); const char *replacement);