X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=madtty%2Fmadtty.h;h=e8123dbed8b8b7608954c4c8bc3c021c4c09391f;hb=f825f4ca53c05c78e52b7e007e07ad76587fb46c;hp=d14c09e0faae93c2c21787e29c3eb58cf62b8231;hpb=8ead06c97e16165208fd9d02ada73d63aeca11f2;p=apps%2Fmadtty.git diff --git a/madtty/madtty.h b/madtty/madtty.h index d14c09e..e8123db 100644 --- a/madtty/madtty.h +++ b/madtty/madtty.h @@ -85,7 +85,7 @@ /* Represents each of the text cells in the terminal screen */ typedef struct RoteCell_ { - unsigned char ch; /* >= 32, that is, control characters are not + unsigned int ch; /* >= 32, that is, control characters are not * allowed to be on the virtual screen */ unsigned char attr; /* a color attribute, as described previously */ @@ -118,12 +118,14 @@ typedef struct RoteTerm_ { * that will be used for newly inserted * characters */ + int pty; /* pty of the process */ pid_t childpid; /* pid of the child process running in the * terminal; 0 for none. This is READ-ONLY. */ RoteTermPrivate *pd; /* private state data */ bool insert; /* insert or replace mode */ + /* --- dirtiness flags: the following flags will be raised when the * corresponding items are modified. They can only be unset by YOU * (when, for example, you redraw the term or something) --- */ @@ -166,7 +168,7 @@ void rote_vt_destroy(RoteTerm *rt); * to execute the command and will exit with status 127. You can catch * that by installing a SIGCHLD handler if you want. */ -pid_t rote_vt_forkpty(RoteTerm *rt, const char *command); +pid_t rote_vt_forkpty(RoteTerm *rt, const char *path, const char *argv[]); /* Disconnects the RoteTerm from its forked child process. This function * should be called when the child process dies or something of the sort. @@ -174,20 +176,8 @@ pid_t rote_vt_forkpty(RoteTerm *rt, const char *command); * certainly tidy. */ void rote_vt_forsake_child(RoteTerm *rt); -/* Does some data plumbing, that is, sees if the sub process has - * something to write to the terminal, and if so, write it. If you - * called rote_vt_fork to start a forked process, you must call - * this function regularly to update the terminal. - * - * This function will not block, that is, if there is no data to be - * read from the child process it will return immediately. */ -void rote_vt_update(RoteTerm *rt); - -/* Puts data into the terminal: if there is a forked process running, - * the data will be sent to it. If there is no forked process, - * the data will simply be injected into the terminal (as in - * rote_vt_inject) */ -void rote_vt_write(RoteTerm *rt, const char *data, int length); +int rote_vt_read(RoteTerm *rt, char *buf, int buflen); +int rote_vt_write(RoteTerm *rt, const char *data, int length); /* Inject data into the terminal. needs NOT be 0-terminated: * its length is solely determined by the parameter. Please @@ -196,7 +186,7 @@ void rote_vt_write(RoteTerm *rt, const char *data, int length); * running in the terminal (if any). For that, you might want * to use rote_vt_write. */ -void rote_vt_inject(RoteTerm *rt, const char *data, int length); +int rote_vt_inject(RoteTerm *rt, const char *data, int length); #ifdef USE_NCURSES /* Paints the virtual terminal screen on the given window, putting @@ -214,8 +204,6 @@ void rote_vt_inject(RoteTerm *rt, const char *data, int length); * cursor of the terminal is supposed to be. * * This function does not call wrefresh(win); you have to do that yourself. - * This function automatically calls rote_vt_update prior to drawing - * so that the drawn contents are accurate. */ void rote_vt_draw(RoteTerm *rt, WINDOW *win, int startrow, int startcol, void (*cur_set_attr)(WINDOW *win, unsigned char attr)); @@ -240,64 +228,4 @@ void *rote_vt_take_snapshot(RoteTerm *rt); * This function does NOT free() the passed buffer */ void rote_vt_restore_snapshot(RoteTerm *rt, void *snapbuf); -/* Returns the pseudo tty descriptor associated with the given terminal. - * Please don't do weird things with it (like close it for instance), - * or things will break - * - * This function returns -1 if the given terminal does not yet have - * an associated pty. A pty is only associated to a terminal when - * needed, e.g. on a call to rote_vt_forkpty. */ -int rote_vt_get_pty_fd(RoteTerm *rt); - -/* Declaration of custom escape sequence callback type. See the - * rote_vt_add_es_handler function for more info */ -typedef int (*rote_es_handler_t)(RoteTerm *rt, const char *es); - -/* Installs a custom escape sequence handler for the given RoteTerm. - * The handler will be called by the library every time it tries to - * recognize an escape sequence; depending on the return value of the - * handler, it will proceed in a different manner. See the description - * of the possible return values (ROTE_HANDLERESULT_* constants) below - * for more info. - * - * This handler will be called EACH TIME THE ESCAPE SEQUENCE BUFFER - * RECEIVES A CHARACTER. Therefore, it must execute speedily in order - * not to create too heavy a performance penalty. In particular, the - * writer of the handler should take care to quickly test for invalid - * or incomplete escape sequences before trying to do more elaborate - * parsing. - * - * The handler will NOT be called with an empty escape sequence (i.e. - * one in which only the initial ESC was received). - * - * The custom handler receives the terminal it pertains to and the - * escape sequence as a string (without the initial escape character). - * - * The handler may of course modify the terminal as it sees fit, taking - * care not to corrupt it of course (in particular, it should appropriately - * raise the line_dirty[] and curpos_dirty flags to indicate what it has - * changed). - */ -void rote_vt_install_handler(RoteTerm *rt, rote_es_handler_t handler); - -/* Possible return values for the custom handler function and their - * meanings: */ -#define ROTE_HANDLERESULT_OK 0 /* means escape sequence was handled */ - -#define ROTE_HANDLERESULT_NOTYET 1 /* means the escape sequence was not - * recognized yet, but there is hope that - * it still will once more characters - * arrive (i.e. it is not yet complete). - * - * The library will thus continue collecting - * characters and calling the handler as - * each character arrives until - * either OK or NOWAY is returned. - */ - -#define ROTE_HANDLERESULT_NOWAY 2 /* means the escape sequence was not - * recognized, and there is no chance - * that it will even if more characters - * are added to it. */ - #endif /* MADTTY_MADTTY_H */