nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added moo_term_pt_get_erase_char(), moved child_alive flag into MooTermPt

Browse Source
This commit is contained in:
Yevgen Muntyan 2005-07-15 06:34:31 +00:00
parent 2bf1b1f9b8
commit 2e48bcb99e
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moo/mooterm/mootermpt-private.h
View File

@ -22,7 +22,7 @@ G_BEGIN_DECLS
struct _MooTermPtPrivate { struct _MooTermPtPrivate {
struct _MooTerm *term; struct _MooTerm *term;
gboolean child_alive;
GQueue *pending_write; /* list->data is GByteArray* */ GQueue *pending_write; /* list->data is GByteArray* */
guint pending_write_id; guint pending_write_id;
}; };

36
moo/mooterm/mootermpt-unix.c
View File

@ -28,6 +28,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <termios.h>
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
@ -55,7 +56,6 @@ typedef struct _MooTermPtUnixClass MooTermPtUnixClass;
struct _MooTermPtUnix { struct _MooTermPtUnix {
MooTermPt parent; MooTermPt parent;
gboolean child_alive;
GPid child_pid; GPid child_pid;
int master; int master;
@ -118,7 +118,8 @@ static void moo_term_pt_unix_class_init (MooTermPtUnixClass *klass)
static void moo_term_pt_unix_init (MooTermPtUnix *pt) static void moo_term_pt_unix_init (MooTermPtUnix *pt)
{ {
pt->child_alive = FALSE; MOO_TERM_PT(pt)->priv->child_alive = FALSE;
pt->child_pid = (GPid)-1; pt->child_pid = (GPid)-1;
pt->master = -1; pt->master = -1;
@ -149,7 +150,7 @@ static void set_size (MooTermPt *pt,
ptu = MOO_TERM_PT_UNIX (pt); ptu = MOO_TERM_PT_UNIX (pt);
if (ptu->child_alive) if (pt->priv->child_alive)
_vte_pty_set_size (ptu->master, width, height); _vte_pty_set_size (ptu->master, width, height);
ptu->width = width; ptu->width = width;
@ -177,7 +178,7 @@ static gboolean fork_command (MooTermPt *pt_gen,
pt = MOO_TERM_PT_UNIX (pt_gen); pt = MOO_TERM_PT_UNIX (pt_gen);
g_return_val_if_fail (!pt->child_alive, FALSE); g_return_val_if_fail (!pt_gen->priv->child_alive, FALSE);
if (!g_shell_parse_argv (cmd, &argv_len, &argv, &err)) if (!g_shell_parse_argv (cmd, &argv_len, &argv, &err))
{ {
@ -257,7 +258,7 @@ static gboolean fork_command (MooTermPt *pt_gen,
else else
g_warning ("%s: could not find io_watch_id source", G_STRLOC); g_warning ("%s: could not find io_watch_id source", G_STRLOC);
pt->child_alive = TRUE; pt_gen->priv->child_alive = TRUE;
return TRUE; return TRUE;
} }
@ -294,9 +295,9 @@ static void kill_child (MooTermPt *pt_gen)
pt->child_pid = (GPid)-1; pt->child_pid = (GPid)-1;
if (pt->child_alive) if (pt_gen->priv->child_alive)
{ {
pt->child_alive = FALSE; pt_gen->priv->child_alive = FALSE;
g_signal_emit_by_name (pt, "child-died"); g_signal_emit_by_name (pt, "child-died");
} }
} }
@ -548,6 +549,7 @@ static void pt_write (MooTermPt *pt,
int data_len) int data_len)
{ {
g_return_if_fail (data == NULL || data_len != 0); g_return_if_fail (data == NULL || data_len != 0);
g_return_if_fail (pt->priv->child_alive);
while (data || !g_queue_is_empty (pt->priv->pending_write)) while (data || !g_queue_is_empty (pt->priv->pending_write))
{ {
@ -611,3 +613,23 @@ static void pt_write (MooTermPt *pt,
else else
stop_writer (pt); stop_writer (pt);
} }
char moo_term_pt_get_erase_char (MooTermPt *pt_gen)
{
MooTermPtUnix *pt = MOO_TERM_PT_UNIX (pt_gen);
struct termios tio;
g_return_val_if_fail (pt->master != -1, 0);
if (!tcgetattr (pt->master, &tio))
{
return tio.c_cc[VERASE];
}
else
{
g_warning ("%s: %s", G_STRLOC,
g_strerror (errno));
return 0;
}
}