Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-12-22 17:03:26 +01:00
Code Issues Projects Releases Wiki Activity

sort includes

Browse Source
This commit is contained in:
zugz (tox) 2020-04-18 00:00:00 +00:00
parent 142ce642f0
commit d75d6e8b60
No known key found for this signature in database
GPG Key ID: 6F2BDA289D04F249
44 changed files with 262 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio_call.c
View File

@ -20,17 +20,17 @@
*
*/
#include "toxic.h"
#include "windows.h"
#include "audio_call.h"
#include "audio_device.h"
#include "chat_commands.h"
#include "chat.h"
#include "friendlist.h"
#include "global_commands.h"
#include "line_info.h"
#include "notify.h"
#include "friendlist.h"
#include "chat.h"
#include "misc_tools.h"
#include "notify.h"
#include "toxic.h"
#include "windows.h"
#ifdef AUDIO

12
src/audio_device.c
View File

@ -23,8 +23,8 @@
#include "audio_device.h"
#include "line_info.h"
#include "settings.h"
#include "misc_tools.h"
#include "settings.h"
#include <AL/al.h>
#include <AL/alc.h>
@ -33,13 +33,13 @@
#include <AL/alext.h>
#endif /* ALC_ALL_DEVICES_SPECIFIER */
#include <stdbool.h>
#include <string.h>
#include <pthread.h>
#include <unistd.h>
#include <stdlib.h>
#include <assert.h>
#include <math.h>
#include <pthread.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
extern struct user_settings *user_settings;
extern struct Winthread Winthread;

12
src/autocomplete.c
View File

@ -20,9 +20,9 @@
*
*/
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#ifdef __APPLE__
#include <sys/types.h>
@ -31,12 +31,12 @@
#include <dirent.h>
#endif /* __APPLE__ */
#include "windows.h"
#include "toxic.h"
#include "misc_tools.h"
#include "line_info.h"
#include "execute.h"
#include "configdir.h"
#include "execute.h"
#include "line_info.h"
#include "misc_tools.h"
#include "toxic.h"
#include "windows.h"
static void print_ac_matches(ToxWindow *self, Tox *m, char **list, size_t n_matches)
{

2
src/autocomplete.h
View File

@ -23,6 +23,8 @@
#ifndef AUTOCOMPLETE_H
#define AUTOCOMPLETE_H
#include "windows.h"
/*
* Looks for all instances in list that begin with the last entered word in line according to pos,
* then fills line with the complete word. e.g. "Hello jo" would complete the line

6
src/avatars.c
View File

@ -20,14 +20,14 @@
*
*/
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "misc_tools.h"
#include "avatars.h"
#include "file_transfers.h"
#include "friendlist.h"
#include "avatars.h"
#include "misc_tools.h"
extern FriendsList Friends;

2
src/avatars.h
View File

@ -23,6 +23,8 @@
#ifndef AVATARS_H
#define AVATARS_H
#include "file_transfers.h"
#define MAX_AVATAR_FILE_SIZE 65536
/* Sends avatar to friendnum.

16
src/bootstrap.c
View File

@ -20,24 +20,24 @@
*
*/
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <arpa/inet.h>
#include <limits.h>
#include <netinet/in.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <curl/curl.h>
#include <tox/tox.h>
#include "line_info.h"
#include "windows.h"
#include "misc_tools.h"
#include "configdir.h"
#include "curl_util.h"
#include "settings.h"
#include "line_info.h"
#include "misc_tools.h"
#include "prompt.h"
#include "settings.h"
#include "windows.h"
extern struct arg_opts arg_opts;
extern struct user_settings *user_settings;

24
src/chat.c
View File

@ -24,28 +24,28 @@
#define _GNU_SOURCE /* needed for wcswidth() */
#endif
#include <assert.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <wchar.h>
#include <assert.h>
#include <limits.h>
#include "toxic.h"
#include "windows.h"
#include "autocomplete.h"
#include "execute.h"
#include "misc_tools.h"
#include "file_transfers.h"
#include "friendlist.h"
#include "toxic_strings.h"
#include "log.h"
#include "line_info.h"
#include "settings.h"
#include "input.h"
#include "help.h"
#include "autocomplete.h"
#include "notify.h"
#include "input.h"
#include "line_info.h"
#include "log.h"
#include "message_queue.h"
#include "misc_tools.h"
#include "notify.h"
#include "settings.h"
#include "toxic.h"
#include "toxic_strings.h"
#include "windows.h"
#ifdef AUDIO
#include "audio_call.h"

2
src/chat.h
View File

@ -23,8 +23,8 @@
#ifndef CHAT_H
#define CHAT_H
#include "windows.h"
#include "toxic.h"
#include "windows.h"
/* set CTRL to -1 if we don't want to send a control signal.
set msg to NULL if we don't want to display a message */

14
src/chat_commands.c
View File

@ -23,15 +23,15 @@
#include <stdlib.h>
#include <string.h>
#include "chat.h"
#include "conference.h"
#include "execute.h"
#include "file_transfers.h"
#include "friendlist.h"
#include "line_info.h"
#include "misc_tools.h"
#include "toxic.h"
#include "windows.h"
#include "misc_tools.h"
#include "friendlist.h"
#include "execute.h"
#include "line_info.h"
#include "conference.h"
#include "chat.h"
#include "file_transfers.h"
extern ToxWindow *prompt;
extern FriendsList Friends;

2
src/chat_commands.h
View File

@ -23,8 +23,8 @@
#ifndef CHAT_COMMANDS_H
#define CHAT_COMMANDS_H
#include "windows.h"
#include "toxic.h"
#include "windows.h"
void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
void cmd_conference_invite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);

38
src/conference.c
View File

@ -24,14 +24,14 @@
#define _GNU_SOURCE /* needed for strcasestr() and wcswidth() */
#endif
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <time.h>
#include <wchar.h>
#include <unistd.h>
#include <inttypes.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <wchar.h>
#ifdef AUDIO
#ifdef __APPLE__
@ -47,21 +47,21 @@
#endif /* __APPLE__ */
#endif /* AUDIO */
#include "windows.h"
#include "toxic.h"
#include "execute.h"
#include "misc_tools.h"
#include "conference.h"
#include "prompt.h"
#include "toxic_strings.h"
#include "log.h"
#include "line_info.h"
#include "settings.h"
#include "input.h"
#include "help.h"
#include "notify.h"
#include "autocomplete.h"
#include "audio_device.h"
#include "autocomplete.h"
#include "conference.h"
#include "execute.h"
#include "help.h"
#include "input.h"
#include "line_info.h"
#include "log.h"
#include "misc_tools.h"
#include "notify.h"
#include "prompt.h"
#include "settings.h"
#include "toxic.h"
#include "toxic_strings.h"
#include "windows.h"
extern char *DATA_FILE;

10
src/conference_commands.c
View File

@ -20,15 +20,15 @@
*
*/
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include "conference.h"
#include "line_info.h"
#include "log.h"
#include "misc_tools.h"
#include "toxic.h"
#include "windows.h"
#include "line_info.h"
#include "misc_tools.h"
#include "log.h"
#include "conference.h"
static void print_err(ToxWindow *self, const char *error_str)
{

2
src/conference_commands.h
View File

@ -23,8 +23,8 @@
#ifndef CONFERENCE_COMMANDS_H
#define CONFERENCE_COMMANDS_H
#include "windows.h"
#include "toxic.h"
#include "windows.h"
void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);

14
src/configdir.c
View File

@ -20,18 +20,18 @@
*
*/
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <unistd.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "toxic.h"
#include "configdir.h"
#include "misc_tools.h"
#include "toxic.h"
/* get the user's home directory. */
void get_home_dir(char *home, int size)

2
src/curl_util.h
View File

@ -23,6 +23,8 @@
#ifndef CURL_UTIL_H
#define CURL_UTIL_H
#include <stdint.h>
/* List based on Mozilla's recommended configurations for modern browsers */
#define TLS_CIPHER_SUITE_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"

10
src/execute.c
View File

@ -20,20 +20,20 @@
*
*/
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "toxic.h"
#include "windows.h"
#include "execute.h"
#include "api.h"
#include "chat_commands.h"
#include "execute.h"
#include "global_commands.h"
#include "conference_commands.h"
#include "line_info.h"
#include "misc_tools.h"
#include "notify.h"
#include "api.h"
#include "toxic.h"
#include "windows.h"
struct cmd_func {
const char *name;

8
src/file_transfers.c
View File

@ -20,18 +20,18 @@
*
*/
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "toxic.h"
#include "windows.h"
#include "friendlist.h"
#include "file_transfers.h"
#include "friendlist.h"
#include "line_info.h"
#include "misc_tools.h"
#include "notify.h"
#include "toxic.h"
#include "windows.h"
extern FriendsList Friends;

2
src/file_transfers.h
View File

@ -25,9 +25,9 @@
#include <limits.h>
#include "notify.h"
#include "toxic.h"
#include "windows.h"
#include "notify.h"
#define KiB 1024
#define MiB 1048576 /* 1024^2 */

22
src/friendlist.c
View File

@ -20,26 +20,26 @@
*
*/
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <time.h>
#include <arpa/inet.h>
#include <assert.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <tox/tox.h>
#include "toxic.h"
#include "windows.h"
#include "avatars.h"
#include "chat.h"
#include "friendlist.h"
#include "misc_tools.h"
#include "line_info.h"
#include "settings.h"
#include "notify.h"
#include "help.h"
#include "line_info.h"
#include "log.h"
#include "avatars.h"
#include "misc_tools.h"
#include "notify.h"
#include "settings.h"
#include "toxic.h"
#include "windows.h"
#ifdef AUDIO
#include "audio_call.h"

2
src/friendlist.h
View File

@ -25,9 +25,9 @@
#include <time.h>
#include "file_transfers.h"
#include "toxic.h"
#include "windows.h"
#include "file_transfers.h"
struct LastOnline {
uint64_t last_on;

20
src/global_commands.c
View File

@ -23,20 +23,20 @@
#include <stdlib.h>
#include <string.h>
#include "toxic.h"
#include "windows.h"
#include "misc_tools.h"
#include "friendlist.h"
#include "log.h"
#include "line_info.h"
#include "conference.h"
#include "prompt.h"
#include "help.h"
#include "term_mplex.h"
#include "avatars.h"
#include "conference.h"
#include "friendlist.h"
#include "help.h"
#include "line_info.h"
#include "log.h"
#include "misc_tools.h"
#include "name_lookup.h"
#include "prompt.h"
#include "qr_code.h"
#include "term_mplex.h"
#include "toxic.h"
#include "toxic_strings.h"
#include "windows.h"
extern char *DATA_FILE;
extern ToxWindow *prompt;

2
src/global_commands.h
View File

@ -23,8 +23,8 @@
#ifndef GLOBAL_COMMANDS_H
#define GLOBAL_COMMANDS_H
#include "windows.h"
#include "toxic.h"
#include "windows.h"
void cmd_accept(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
void cmd_add(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);

4
src/help.c
View File

@ -22,10 +22,10 @@
#include <string.h>
#include "windows.h"
#include "toxic.h"
#include "help.h"
#include "misc_tools.h"
#include "toxic.h"
#include "windows.h"
#ifdef PYTHON
#include "api.h"

12
src/input.c
View File

@ -26,14 +26,14 @@
#include <wchar.h>
#include "toxic.h"
#include "windows.h"
#include "misc_tools.h"
#include "toxic_strings.h"
#include "line_info.h"
#include "notify.h"
#include "conference.h"
#include "line_info.h"
#include "misc_tools.h"
#include "notify.h"
#include "settings.h"
#include "toxic.h"
#include "toxic_strings.h"
#include "windows.h"
extern struct user_settings *user_settings;

14
src/line_info.c
View File

@ -20,19 +20,19 @@
*
*/
#include <stdarg.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <stdarg.h>
#include "toxic.h"
#include "windows.h"
#include "line_info.h"
#include "conference.h"
#include "settings.h"
#include "notify.h"
#include "line_info.h"
#include "message_queue.h"
#include "misc_tools.h"
#include "notify.h"
#include "settings.h"
#include "toxic.h"
#include "windows.h"
extern struct user_settings *user_settings;

2
src/line_info.h
View File

@ -23,8 +23,8 @@
#ifndef LINE_INFO_H
#define LINE_INFO_H
#include "windows.h"
#include "toxic.h"
#include "windows.h"
#define MAX_HISTORY 100000
#define MIN_HISTORY 40

10
src/log.c
View File

@ -22,16 +22,16 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <sys/stat.h>
#include <time.h>
#include "configdir.h"
#include "line_info.h"
#include "log.h"
#include "misc_tools.h"
#include "settings.h"
#include "toxic.h"
#include "windows.h"
#include "misc_tools.h"
#include "log.h"
#include "settings.h"
#include "line_info.h"
extern struct user_settings *user_settings;

8
src/message_queue.c
View File

@ -22,12 +22,12 @@
#include <stdlib.h>
#include "toxic.h"
#include "windows.h"
#include "message_queue.h"
#include "misc_tools.h"
#include "line_info.h"
#include "log.h"
#include "message_queue.h"
#include "misc_tools.h"
#include "toxic.h"
#include "windows.h"
void cqueue_cleanup(struct chat_queue *q)
{

13
src/misc_tools.c
View File

@ -20,18 +20,19 @@
*
*/
#include <stdlib.h>
#include <arpa/inet.h>
#include <ctype.h>
#include <string.h>
#include <time.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <time.h>
#include "toxic.h"
#include "windows.h"
#include "file_transfers.h"
#include "misc_tools.h"
#include "settings.h"
#include "file_transfers.h"
#include "toxic.h"
#include "windows.h"
extern ToxWindow *prompt;
extern struct user_settings *user_settings;

2
src/misc_tools.h
View File

@ -24,8 +24,8 @@
#include <sys/stat.h>
#include "windows.h"
#include "toxic.h"
#include "windows.h"
#ifndef MIN
#define MIN(x, y) (((x) < (y)) ? (x) : (y))

16
src/name_lookup.c
View File

@ -20,18 +20,18 @@
*
*/
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <curl/curl.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "toxic.h"
#include "windows.h"
#include "line_info.h"
#include "global_commands.h"
#include "misc_tools.h"
#include "configdir.h"
#include "curl_util.h"
#include "global_commands.h"
#include "line_info.h"
#include "misc_tools.h"
#include "toxic.h"
#include "windows.h"
extern struct arg_opts arg_opts;
extern struct Winthread Winthread;

16
src/notify.c
View File

@ -20,21 +20,21 @@
*
*/
#include <assert.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdbool.h>
#include <unistd.h>
#include <stdarg.h>
#include <time.h>
#include <assert.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#include "notify.h"
#include "audio_device.h"
#include "settings.h"
#include "line_info.h"
#include "misc_tools.h"
#include "notify.h"
#include "settings.h"
#include "xtra.h"
#if defined(AUDIO) || defined(SOUND_NOTIFY)

26
src/prompt.c
View File

@ -28,20 +28,20 @@
#include <string.h>
#include <wchar.h>
#include "toxic.h"
#include "windows.h"
#include "prompt.h"
#include "friendlist.h"
#include "execute.h"
#include "misc_tools.h"
#include "toxic_strings.h"
#include "log.h"
#include "line_info.h"
#include "settings.h"
#include "input.h"
#include "help.h"
#include "notify.h"
#include "autocomplete.h"
#include "execute.h"
#include "friendlist.h"
#include "help.h"
#include "input.h"
#include "line_info.h"
#include "log.h"
#include "misc_tools.h"
#include "notify.h"
#include "prompt.h"
#include "settings.h"
#include "toxic.h"
#include "toxic_strings.h"
#include "windows.h"
extern ToxWindow *prompt;
extern struct user_settings *user_settings;

4
src/qr_code.c
View File

@ -22,14 +22,14 @@
#ifdef QRCODE
#include <stdlib.h>
#include <qrencode.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include "qr_code.h"
#include "toxic.h"
#include "windows.h"
#include "qr_code.h"
#ifdef QRPNG
#include <png.h>

12
src/settings.c
View File

@ -20,23 +20,23 @@
*
*/
#include <ctype.h>
#include <libconfig.h>
#include <stdlib.h>
#include <string.h>
#include <libconfig.h>
#include <ctype.h>
#include "configdir.h"
#include "misc_tools.h"
#include "notify.h"
#include "toxic.h"
#include "windows.h"
#include "configdir.h"
#include "notify.h"
#include "misc_tools.h"
#ifdef AUDIO
#include "audio_device.h"
#endif /* AUDIO */
#include "settings.h"
#include "line_info.h"
#include "settings.h"
#ifndef PACKAGE_DATADIR
#define PACKAGE_DATADIR "."

6
src/term_mplex.c
View File

@ -26,18 +26,18 @@
#include <string.h> /* strlen, strcpy, strstr, strchr, strrchr, strcat, strncmp */
#include <pthread.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#include <tox/tox.h>
#include "execute.h"
#include "windows.h"
#include "settings.h"
#include "term_mplex.h"
#include "toxic.h"
#include "settings.h"
#include "windows.h"
extern struct ToxWindow *prompt;
extern struct user_settings *user_settings;

58
src/toxic.c
View File

@ -20,50 +20,50 @@
*
*/
#include <ctype.h>
#include <curses.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
#include <limits.h>
#include <locale.h>
#include <netdb.h>
#include <pthread.h>
#include <signal.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdarg.h>
#include <signal.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <pthread.h>
#include <getopt.h>
#include <netdb.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
#include <limits.h>
#include <termios.h>
#include <ctype.h>
#include <time.h>
#include <unistd.h>
#include <curl/curl.h>
#include <tox/tox.h>
#include <tox/toxencryptsave.h>
#include <tox/tox.h>
#include "audio_device.h"
#include "bootstrap.h"
#include "conference.h"
#include "configdir.h"
#include "execute.h"
#include "file_transfers.h"
#include "friendlist.h"
#include "line_info.h"
#include "log.h"
#include "message_queue.h"
#include "misc_tools.h"
#include "name_lookup.h"
#include "notify.h"
#include "prompt.h"
#include "settings.h"
#include "term_mplex.h"
#include "toxic.h"
#include "windows.h"
#include "friendlist.h"
#include "prompt.h"
#include "misc_tools.h"
#include "conference.h"
#include "file_transfers.h"
#include "line_info.h"
#include "settings.h"
#include "log.h"
#include "notify.h"
#include "audio_device.h"
#include "message_queue.h"
#include "execute.h"
#include "term_mplex.h"
#include "name_lookup.h"
#include "bootstrap.h"
#ifdef X11
#include "xtra.h"

6
src/toxic_strings.c
View File

@ -24,11 +24,11 @@
#include <string.h>
#include <wchar.h>
#include "toxic.h"
#include "windows.h"
#include "misc_tools.h"
#include "toxic_strings.h"
#include "notify.h"
#include "toxic.h"
#include "toxic_strings.h"
#include "windows.h"
/* Adds char to line at pos. Return 0 on success, -1 if line buffer is full */
int add_char_to_buf(ChatContext *ctx, wint_t ch)

22
src/video_call.c
View File

@ -20,23 +20,23 @@
*
*/
#include "toxic.h"
#include "windows.h"
#include "video_call.h"
#include "video_device.h"
#include "chat_commands.h"
#include "global_commands.h"
#include "line_info.h"
#include "notify.h"
#include "misc_tools.h"
#include "notify.h"
#include "toxic.h"
#include "video_call.h"
#include "video_device.h"
#include "windows.h"
#include <stdbool.h>
#include <curses.h>
#include <string.h>
#include <pthread.h>
#include <unistd.h>
#include <stdlib.h>
#include <assert.h>
#include <curses.h>
#include <pthread.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef VIDEO

23
src/video_device.c
View File

@ -20,8 +20,8 @@
*
*/
#include "video_device.h"
#include "video_call.h"
#include "video_device.h"
#include <sys/ioctl.h>
@ -30,13 +30,13 @@
#if defined(__OSX__) || defined(__APPLE__)
#import "osx_video.h"
#else
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xos.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <X11/Xlib.h>
#include <X11/Xos.h>
#include <X11/Xutil.h>
#if defined(__OpenBSD__) || defined(__NetBSD__)
#include <sys/videoio.h>
#else
@ -45,16 +45,15 @@
#endif /* __OSX__ || __APPLE__ */
#include "line_info.h"
#include "settings.h"
#include "misc_tools.h"
#include "settings.h"
#include <errno.h>
#include <stdbool.h>
#include <string.h>
#include <pthread.h>
#include <unistd.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef VIDEO

18
src/windows.c
View File

@ -20,22 +20,22 @@
*
*/
#include <ctype.h>
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <ctype.h>
#include "friendlist.h"
#include "prompt.h"
#include "toxic.h"
#include "windows.h"
#include "conference.h"
#include "avatars.h"
#include "chat.h"
#include "conference.h"
#include "file_transfers.h"
#include "friendlist.h"
#include "line_info.h"
#include "misc_tools.h"
#include "avatars.h"
#include "prompt.h"
#include "settings.h"
#include "file_transfers.h"
#include "toxic.h"
#include "windows.h"
extern char *DATA_FILE;
extern struct Winthread Winthread;

4
src/windows.h
View File

@ -24,9 +24,9 @@
#define WINDOWS_H
#include <pthread.h>
#include <wctype.h>
#include <wchar.h>
#include <signal.h>
#include <wchar.h>
#include <wctype.h>
#include <tox/tox.h>

8
src/xtra.c
View File

@ -20,19 +20,19 @@
*
*/
#include "xtra.h"
#include "misc_tools.h"
#include "xtra.h"
#ifndef __APPLE__
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <pthread.h>
#include <assert.h>
#include <pthread.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
const Atom XtraTerminate = 1;