Merge branch 'sched'

[paraslash.git] / para.h

diff --git a/para.h b/para.h
index d495139..3f05079 100644 (file)
--- a/para.h
+++ b/para.h
@@ -23,25 +23,19 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>

-#include <signal.h>
-#include <sys/signal.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>

 #include <time.h> /* time(), localtime() */
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <time.h> /* time(), localtime() */
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>

-#include <stropts.h>
-#include <poll.h>
-#include <sys/socket.h>
+#include <ctype.h>

 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <ctype.h>
+#include <sys/socket.h>

 #include <sys/un.h> /* needed by create_pf_socket */
 #include <sys/un.h> /* needed by create_pf_socket */

+#include <string.h>

 #include "gcc-compat.h"
 
 /* some internal constants */
 #include "gcc-compat.h"
 
 /* some internal constants */


@@ -49,9 +43,9 @@
 #define MAXLINE 255
 
 
 #define MAXLINE 255
 
 

-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define ABS(a) ((a) > 0 ? (a) : -(a))
+#define PARA_MIN(a,b) ((a) < (b) ? (a) : (b))
+#define PARA_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define PARA_ABS(a) ((a) > 0 ? (a) : -(a))

 
 /* Loglevels */
 #define DEBUG 1
 
 /* Loglevels */
 #define DEBUG 1


@@ -122,9 +116,7 @@ int para_open_audiod_pipe(char *);
 int read_audiod_pipe(int, void (*)(char *));
 
 /* exec */
 int read_audiod_pipe(int, void (*)(char *));
 
 /* exec */

-int file_exists(const char *);
-int para_exec(pid_t *, const char *, char *const [], int *);
-int para_exec_cmdline_pid(pid_t *, char *, int *);
+int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);

 
 /* signal */
 int para_signal_init(void);
 
 /* signal */
 int para_signal_init(void);


@@ -159,22 +151,23 @@ enum {
        SI_AUDIOD_UPTIME,       SI_SELECTOR,            NUM_STAT_ITEMS
 };
 
        SI_AUDIOD_UPTIME,       SI_SELECTOR,            NUM_STAT_ITEMS
 };
 

+int stat_item_valid(const char *item);

 int stat_line_valid(const char *);
 int stat_line_valid(const char *);

-void stat_client_write(char *msg);
-int stat_client_add(int);
+void stat_client_write(char *msg, int itemnum);
+int stat_client_add(int fd, long unsigned mask);

 void dump_empty_status(void);
 unsigned for_each_line(char *, int, void (*)(char *));
 
 struct stat_item_data {
 void dump_empty_status(void);
 unsigned for_each_line(char *, int, void (*)(char *));
 
 struct stat_item_data {

-       char *prefix, *postfix;
+       const char *prefix, *postfix;

        unsigned x, y, len;
        int fg, bg, align;
 };
 
 /* gui_theme */
 struct gui_theme {
        unsigned x, y, len;
        int fg, bg, align;
 };
 
 /* gui_theme */
 struct gui_theme {

-       char *name;
-       char *author;
+       const char *name;
+       const char *author;

        int sb_fg, sb_bg;
        int cmd_fg, cmd_bg;
        int output_fg, output_bg;
        int sb_fg, sb_bg;
        int cmd_fg, cmd_bg;
        int output_fg, output_bg;


@@ -182,7 +175,7 @@ struct gui_theme {
        int err_msg_fg, err_msg_bg;
        int welcome_fg, welcome_bg;
        int sep_fg, sep_bg;
        int err_msg_fg, err_msg_bg;
        int welcome_fg, welcome_bg;
        int sep_fg, sep_bg;

-       char *sep_str;
+       const char *sep_str;

        int default_fg, default_bg;
 
        int top_lines_default, top_lines_min;
        int default_fg, default_bg;
 
        int top_lines_default, top_lines_min;


@@ -198,7 +191,7 @@ void prev_theme(struct gui_theme *);
 #define CENTER 3
 
 
 #define CENTER 3
 
 

-__printf_2_3 void para_log(int, char*, ...);
+__printf_2_3 void para_log(int, const char*, ...);

 
 /* taken from printf man page */
 #define PARA_VSPRINTF(fmt, p) \
 
 /* taken from printf man page */
 #define PARA_VSPRINTF(fmt, p) \


@@ -222,6 +215,3 @@ __printf_2_3 void para_log(int, char*, ...);
                p = para_realloc(p, size); \
        } \
 }
                p = para_realloc(p, size); \
        } \
 }

-
-
-