Commit 6f90d7c1 authored by Nalin Dahyabhai's avatar Nalin Dahyabhai

formatting fixup. formatting fixups. Try using U+FFFF as the "invalid"

* src/dumpkeys.c: formatting fixup.
* src/iso2022.c: formatting fixups.  Try using U+FFFF as the "invalid" marker
	character instead of '?', because it's actually invalid.
* src/pty.c: formatting fixup.
* src/reflect.c: formatting fixup.
* src/ring.c: formatting fixup.
* src/ssfe.c: formatting fixups.
* src/trie.c: formatting fixup.
* src/vte.c: formatting fixups.
* src/vte.c(vte_terminal_get_accessible): don't add a weak pointer to the
	AtkObject if it isn't a valid AtkObject.  Only emit text-changed signals
	if we managed to create a valid accessible peer.
* src/vteaccess.c: formatting fixups.
* src/vteaccess.c(vte_terminal_accessible_init): unset the EXPANDABLE Atk state.
	Set the RESIZABLE state.
* src/vteaccess.c(vte_terminal_accessible_class_init): Remove spurious(?) call
	to bind_textdomain.
* src/vteaccess.c(vte_terminal_accessible_get_type): check if the accessible
	peer of our peer's ancestor is derived from GtkAccessible, and if it
	isn't derive from GtkAccessible instead of that.
* src/vteaccess.c(vte_terminal_accessible_get_type): register our factory type.
* src/vteaccess.c, src/vteaccess.c: add VteTerminalAccessibleFactory.
* src/vtedraw.c: formatting fixup.
parent d99012f3
2003-04-23 nalin
* src/dumpkeys.c: formatting fixup.
* src/iso2022.c: formatting fixups. Try using U+FFFF as the "invalid"
marker character instead of '?', because it's actually invalid.
* src/pty.c: formatting fixup.
* src/reflect.c: formatting fixup.
* src/ring.c: formatting fixup.
* src/ssfe.c: formatting fixups.
* src/trie.c: formatting fixup.
* src/vte.c: formatting fixups.
* src/vte.c(vte_terminal_get_accessible): don't add a weak pointer to
the AtkObject if it isn't a valid AtkObject. Only emit text-changed
signals if we managed to create a valid accessible peer.
* src/vteaccess.c: formatting fixups.
* src/vteaccess.c(vte_terminal_accessible_init): unset the EXPANDABLE
Atk state. Set the RESIZABLE state.
* src/vteaccess.c(vte_terminal_accessible_class_init): Remove
spurious(?) call to bind_textdomain.
* src/vteaccess.c(vte_terminal_accessible_get_type): check if the
accessible peer of our peer's ancestor is derived from GtkAccessible,
and if it isn't derive from GtkAccessible instead of that.
* src/vteaccess.c(vte_terminal_accessible_get_type): register our
factory type.
* src/vteaccess.c, src/vteaccess.c: add VteTerminalAccessibleFactory.
* src/vtedraw.c: formatting fixup.
2003-04-23 nalin
* src/vte.c(vte_terminal_background_update): always refetch the
root pixmap if we don't currently have a background image (#111386).
......
......@@ -61,7 +61,7 @@ decset(int mode, gboolean value)
static void
home(void)
{
g_print(ESC "[1;1H");
g_print(ESC "[1;1H");
}
/* Clear the screen. */
......
......@@ -52,7 +52,7 @@
/* Fudge factor we add to wide map identifiers to keep them distinct. */
#define WIDE_FUDGE 0x100000
/* An invalid codepoint. */
#define INVALID_CODEPOINT 0x3F
#define INVALID_CODEPOINT 0xFFFF
struct _vte_iso2022_map {
gulong from;
......@@ -379,7 +379,7 @@ _vte_iso2022_map_get(gunichar mapname,
if (and_mask) {
*and_mask = (~(0));
}
/* Make sure we have a map, erm, map. */
if (maps == NULL) {
maps = g_tree_new(_vte_direct_compare);
......
......@@ -869,7 +869,7 @@ _vte_pty_start_helper(void)
* going to work (assuming we can open a pty using some other
* method). */
g_warning(_("can not run %s"), LIBEXECDIR "/gnome-pty-helper");
return FALSE;
return FALSE;
}
/* Create a communication link for use with the helper. */
tmp[0] = open("/dev/null", O_RDONLY);
......
......@@ -190,7 +190,7 @@ update_contents(AtkObject *obj, GtkWidget *widget)
}
s = g_string_append_unichar(s,
g_array_index(contents,
gunichar,
gunichar,
i));
}
if (i == caret) {
......
......@@ -276,7 +276,7 @@ _vte_ring_remove(VteRing * ring, long position, gboolean free)
for (i = position; i < ring->delta + ring->length - 1; i++) {
ring->array[i % ring->max] = ring->array[(i + 1) % ring->max];
}
/* Store a NULL in the position at the end of the buffer and decrement
* its length (got room for one more now). */
ring->array[(ring->delta + ring->length - 1) % ring->max] = NULL;
......
......@@ -347,21 +347,21 @@ static void doprotcommand(void) {
switch (protcmd[0]) {
case 'i' : dispmode=2; /* set irc mode, ack */
bold=inv=under=0;
bold=inv=under=0;
write(writefd, "@ssfe@i\n", 8);
break;
case 'c' : dispmode=1; /* set cooked mode, ack */
write(writefd, "@ssfe@c\n", 8);
break;
break;
case 's' : setstatus(protcmd+1); /* set status */
displaystatus();
break;
displaystatus();
break;
case 'T' : strncpy(ctrl_t, protcmd+1, 127); /* set ^t's text */
ctrl_t[126] = '\0';
strcat(ctrl_t, "\n");
break;
case 't' : addtab(protcmd+1); /* add tabkey entry */
break;
break;
case 'l' : fullscroll(); /* clear screen */
normal();
clearscreen();
......@@ -397,7 +397,7 @@ static void doprotcommand(void) {
}
break;
case 'o' : strcpy(o_buffer, protcmd+1);
break;
break;
}
}
......
......@@ -649,7 +649,7 @@ _vte_trie_matchx(struct _vte_trie *trie, const gunichar *pattern, size_t length,
for (i = 0; i < bestarray->n_values; i++) {
g_value_array_append(array,
g_value_array_get_nth(bestarray,
i));
i));
}
g_value_array_free(bestarray);
}
......
......@@ -455,7 +455,7 @@ static char *vte_terminal_get_text_range_maybe_wrapped(VteTerminal *terminal,
glong end_col,
gboolean wrap,
gboolean(*is_selected)(VteTerminal *,
glong,
glong,
glong,
gpointer),
gpointer data,
......@@ -463,7 +463,7 @@ static char *vte_terminal_get_text_range_maybe_wrapped(VteTerminal *terminal,
static char *vte_terminal_get_text_maybe_wrapped(VteTerminal *terminal,
gboolean wrap,
gboolean(*is_selected)(VteTerminal *,
glong,
glong,
glong,
gpointer),
gpointer data,
......@@ -8477,7 +8477,7 @@ vte_terminal_get_text_range(VteTerminal *terminal,
glong start_row, glong start_col,
glong end_row, glong end_col,
gboolean(*is_selected)(VteTerminal *,
glong,
glong,
glong,
gpointer),
gpointer data,
......@@ -8498,7 +8498,7 @@ vte_terminal_get_text_range_maybe_wrapped(VteTerminal *terminal,
glong end_row, glong end_col,
gboolean wrap,
gboolean(*is_selected)(VteTerminal *,
glong,
glong,
glong,
gpointer),
gpointer data,
......@@ -8662,7 +8662,7 @@ static char *
vte_terminal_get_text_maybe_wrapped(VteTerminal *terminal,
gboolean wrap,
gboolean(*is_selected)(VteTerminal *,
glong,
glong,
glong,
gpointer),
gpointer data,
......@@ -8702,7 +8702,7 @@ vte_terminal_get_text_maybe_wrapped(VteTerminal *terminal,
char *
vte_terminal_get_text(VteTerminal *terminal,
gboolean(*is_selected)(VteTerminal *,
glong,
glong,
glong,
gpointer),
gpointer data,
......@@ -11373,7 +11373,6 @@ vte_terminal_draw_rectangle(VteTerminal *terminal,
gint width,
gint height)
{
vte_terminal_draw_line(terminal, entry,
x, y, x, y + height);
vte_terminal_draw_line(terminal, entry,
......@@ -12819,11 +12818,13 @@ vte_terminal_get_accessible(GtkWidget *widget)
access = terminal->pvt->accessible;
} else {
access = vte_terminal_accessible_new(terminal);
terminal->pvt->accessible = access;
g_object_add_weak_pointer(G_OBJECT(access),
&terminal->pvt->accessible);
if (ATK_IS_OBJECT(access)) {
terminal->pvt->accessible = access;
g_object_add_weak_pointer(G_OBJECT(access),
&terminal->pvt->accessible);
terminal->pvt->accessible_emit = TRUE;
}
}
terminal->pvt->accessible_emit = TRUE;
return access;
}
......
This diff is collapsed.
......@@ -30,7 +30,11 @@ G_BEGIN_DECLS
/* The terminal accessibility object itself. */
typedef struct _VteTerminalAccessible VteTerminalAccessible;
struct _VteTerminalAccessible {
/*< public > */
GtkAccessible parent;
/*< private > */
/* Unknown GailWidget implementation stuffs, exact size of which is
* worked out at run-time. */
};
/* The object's class structure. */
......@@ -39,6 +43,9 @@ struct _VteTerminalAccessibleClass {
/*< public > */
/* Inherited parent class. */
GtkAccessibleClass parent_class;
/*< private > */
/* Unknown GailWidgetClass implementation stuffs, exact size of which
* is worked out at run-time. */
};
/* The object's type. */
......@@ -60,6 +67,40 @@ GtkType vte_terminal_accessible_get_type(void);
AtkObject *vte_terminal_accessible_new(VteTerminal *terminal);
/* The terminal accessibility object's factory. */
typedef struct _VteTerminalAccessibleFactory VteTerminalAccessibleFactory;
struct _VteTerminalAccessibleFactory {
/*< public > */
AtkObjectFactory parent;
/*< private > */
};
/* The object's class structure. */
typedef struct _VteTerminalAccessibleFactoryClass VteTerminalAccessibleFactoryClass;
struct _VteTerminalAccessibleFactoryClass {
/*< public > */
AtkObjectFactoryClass parent;
/*< private > */
};
/* The object's factory's type. */
GtkType vte_terminal_accessible_factory_get_type(void);
#define VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY (vte_terminal_accessible_factory_get_type())
#define VTE_TERMINAL_ACCESSIBLE_FACTORY(obj) (GTK_CHECK_CAST((obj),\
VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY,\
VteTerminalAccessibleFactory))
#define VTE_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass) GTK_CHECK_CLASS_CAST((klass),\
VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY,\
VteTerminalAccessibleFactoryClass)
#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY(obj) GTK_CHECK_TYPE((obj),\
VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY)
#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass) GTK_CHECK_CLASS_TYPE((klass),\
VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY)
#define VTE_TERMINAL_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
AtkObjectFactory *vte_terminal_accessible_factory_new(void);
G_END_DECLS
#endif
......@@ -113,7 +113,7 @@ _vte_draw_free(struct _vte_draw *draw)
draw->widget = NULL;
}
draw->started = FALSE;
g_free(draw);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment