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

-ansi -pedantic fixes

master
Yevgen Muntyan 2007-01-11 20:28:22 -06:00
parent 5f3c34fad3
commit ccf7d55ebe
42 changed files with 379 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moo.mprj
View File

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<medit-project version="1.0" type="C" name="moo">
<active>gtk-cvs</active>
<commands>
<compile>cd $(builddir) &amp;&amp; $(make) $(base).lo</compile>
</commands>
<configurations>
<debug>
<build_dir>build/debug</build_dir>

6
moo/mooapp/mooappinput.c
View File

@ -447,7 +447,11 @@ read_input (GIOChannel *source,
char c;
int bytes_read;
struct pollfd fd = {self->pipe, POLLIN | POLLPRI, 0};
struct pollfd fd;
fd.fd = self->pipe;
fd.events = POLLIN | POLLPRI;
fd.revents = 0;
switch (poll (&fd, 1, 0))
{

14
moo/mooapp/moohtml.c
View File

@ -75,7 +75,7 @@ typedef enum {
MOO_HTML_HEADING = 1 << 14,
MOO_HTML_FONT_SIZE = 1 << 15,
MOO_HTML_FONT_PT_SIZE = 1 << 16,
MOO_HTML_FONT_FACE = 1 << 17,
MOO_HTML_FONT_FACE = 1 << 17
} MooHtmlAttrMask;
struct _MooHtmlAttr
@ -471,7 +471,10 @@ moo_html_load_url_real (MooHtml *html,
g_return_val_if_fail (url != NULL, FALSE);
if (!moo_html_parse_url (url, &scheme, &base, &anchor))
g_return_val_if_reached (FALSE);
{
g_warning ("%s: invalid url '%s'", G_STRLOC, url);
return FALSE;
}
if (!scheme)
scheme = g_strdup ("file://");
@ -1139,7 +1142,7 @@ moo_html_parse_url (const char *url,
regex = egg_regex_new ("^([a-zA-Z]+://)?([^#]*)(#(.*))?$", 0, 0, NULL);
g_return_val_if_fail (regex != NULL, FALSE);
if (egg_regex_match (regex, url, 0) < 1)
if (!egg_regex_match (regex, url, 0))
{
egg_regex_free (regex);
return FALSE;
@ -1388,7 +1391,10 @@ moo_html_insert_text (MooHtml *html,
const char *p;
if (tag && tag->attr && (tag->attr->mask & MOO_HTML_PRE))
return moo_html_insert_verbatim (html, buffer, iter, tag, text);
{
moo_html_insert_verbatim (html, buffer, iter, tag, text);
return;
}
while (*text)
{

2
moo/mooedit/gtksourceview/upstream/gtksourcecontextengine.c
View File

@ -3038,7 +3038,7 @@ create_reg_all (Context *context,
* or parser need to check it */
else
{
// g_critical ("%s: oops", G_STRLOC);
/* g_critical ("%s: oops", G_STRLOC); */
append = FALSE;
}

34
moo/mooedit/gtksourceview/upstream/gtksourcestylemanager.c
View File

@ -408,22 +408,24 @@ gtk_source_style_manager_prepend_search_path (GtkSourceStyleManager *manager,
g_free (new_dirs);
}
// gboolean
// gtk_source_style_manager_add_scheme (GtkSourceStyleManager *manager,
// const gchar *filename)
// {
// GtkSourceStyleScheme *scheme;
//
// g_return_val_if_fail (GTK_IS_SOURCE_STYLE_MANAGER (manager), FALSE);
// g_return_val_if_fail (filename != NULL, FALSE);
//
// scheme = _gtk_source_style_scheme_new_from_file (filename);
//
// if (scheme == NULL)
// return FALSE;
//
// /* ??? */
// }
#if 0
gboolean
gtk_source_style_manager_add_scheme (GtkSourceStyleManager *manager,
const gchar *filename)
{
GtkSourceStyleScheme *scheme;
g_return_val_if_fail (GTK_IS_SOURCE_STYLE_MANAGER (manager), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
scheme = _gtk_source_style_scheme_new_from_file (filename);
if (scheme == NULL)
return FALSE;
/* ??? */
}
#endif
static void
reload_if_needed (GtkSourceStyleManager *mgr)

2
moo/mooedit/language-specs/m4.lang
View File

@ -23,7 +23,7 @@
</context>
<context id="m4-function-call"><!-- style-ref="test:_violet"-->
<start>\(</start>
<start>\((?!\))</start>
<end>\)</end>
<include>
<context ref="ARG-M"/>

5
moo/mooedit/moocmdview.c
View File

@ -64,11 +64,6 @@ enum {
static guint signals[LAST_SIGNAL];
enum {
PROP_0,
};
/* MOO_TYPE_CMD_VIEW */
G_DEFINE_TYPE (MooCmdView, moo_cmd_view, MOO_TYPE_LINE_VIEW)

4
moo/mooedit/moocommand-exe-unix.c
View File

@ -646,9 +646,9 @@ exe_type_create_command (G_GNUC_UNUSED MooCommandType *type,
g_return_val_if_fail (cmd_line && *cmd_line, NULL);
if (!parse_input (moo_command_data_get (data, KEY_INPUT), &input))
g_return_val_if_reached (NULL);
return NULL;
if (!parse_output (moo_command_data_get (data, KEY_OUTPUT), &output))
g_return_val_if_reached (NULL);
return NULL;
cmd = _moo_command_exe_new (cmd_line,
moo_command_options_parse (options),

34
moo/mooedit/moocommand.c
View File

@ -397,6 +397,28 @@ save_all (MooEdit *doc)
}
static gboolean
check_context (MooCommandOptions options,
gpointer doc,
gpointer window)
{
if ((options & MOO_COMMAND_NEED_WINDOW) &&
!MOO_IS_EDIT_WINDOW (window))
return FALSE;
if ((options & MOO_COMMAND_NEED_DOC) && doc == NULL)
return FALSE;
if ((options & MOO_COMMAND_NEED_FILE) &&
!(MOO_IS_EDIT (doc) && moo_edit_get_filename (doc) != NULL))
return FALSE;
if ((options & MOO_COMMAND_NEED_SAVE) && !MOO_IS_EDIT (doc))
return FALSE;
return TRUE;
}
void
moo_command_run (MooCommand *cmd,
MooCommandContext *ctx)
@ -410,17 +432,7 @@ moo_command_run (MooCommand *cmd,
doc = moo_command_context_get_doc (ctx);
window = moo_command_context_get_window (ctx);
if (cmd->options & MOO_COMMAND_NEED_WINDOW)
g_return_if_fail (MOO_IS_EDIT_WINDOW (window));
if (cmd->options & MOO_COMMAND_NEED_DOC)
g_return_if_fail (doc != NULL);
if (cmd->options & MOO_COMMAND_NEED_FILE)
g_return_if_fail (MOO_IS_EDIT (doc) && moo_edit_get_filename (doc) != NULL);
if (cmd->options & MOO_COMMAND_NEED_SAVE)
g_return_if_fail (MOO_IS_EDIT (doc));
g_return_if_fail (check_context (cmd->options, doc, window));
if (cmd->options & MOO_COMMAND_NEED_SAVE_ALL)
{

2
moo/mooedit/moocompletionsimple.c
View File

@ -547,7 +547,7 @@ moo_completion_group_find (MooCompletionGroup *group,
egg_regex_clear (group->regex);
if (egg_regex_match (group->regex, line, 0) >= 1)
if (egg_regex_match (group->regex, line, 0))
{
guint i;

1
moo/mooedit/mooedit-bookmarks.c
View File

@ -27,7 +27,6 @@ static void disconnect_bookmark (MooEditBookmark *bk);
static void
moo_edit_bookmark_finalize (GObject *object)
{
// MooEditBookmark *bk = MOO_EDIT_BOOKMARK (object);
G_OBJECT_CLASS(moo_edit_bookmark_parent_class)->finalize (object);
}

9
moo/mooedit/mooedit.c
View File

@ -837,7 +837,8 @@ try_mode_string (MooEdit *edit,
if ((start = strstr (string, KATE_MODE_STRING)))
{
start += strlen (KATE_MODE_STRING);
return parse_kate_mode_string (edit, start);
parse_kate_mode_string (edit, start);
return;
}
if ((start = strstr (string, EMACS_MODE_STRING)))
@ -847,7 +848,8 @@ try_mode_string (MooEdit *edit,
if ((end = strstr (start, EMACS_MODE_STRING)) && end > start)
{
end[0] = 0;
return parse_emacs_mode_string (edit, start);
parse_emacs_mode_string (edit, start);
return;
}
}
@ -858,7 +860,8 @@ try_mode_string (MooEdit *edit,
if ((end = strstr (start, MOO_MODE_STRING)) && end > start)
{
end[0] = 0;
return parse_moo_mode_string (edit, start);
parse_moo_mode_string (edit, start);
return;
}
}
}

13
moo/mooedit/mooeditinput.c
View File

@ -734,19 +734,22 @@ text_view_start_selection_dnd (GtkTextView *text_view,
GdkDragContext *context;
GtkTargetList *target_list;
static const GtkTargetEntry target_table[] = {
#if !GTK_CHECK_VERSION(2,10,0)
static const GtkTargetEntry target_table[] = {
{ (char*) "GTK_TEXT_BUFFER_CONTENTS", GTK_TARGET_SAME_APP, 0 }
#endif
};
target_list = gtk_target_list_new (target_table, G_N_ELEMENTS (target_table));
#else
target_list = gtk_target_list_new (NULL, 0);
#endif
gtk_target_list_add_text_targets (target_list, 0);
text_view->drag_start_x = -1;
text_view->drag_start_y = -1;
text_view->pending_place_cursor_button = 0;
target_list = gtk_target_list_new (target_table, G_N_ELEMENTS (target_table));
gtk_target_list_add_text_targets (target_list, 0);
context = gtk_drag_begin (GTK_WIDGET (text_view), target_list,
(GdkDragAction) (GDK_ACTION_COPY | GDK_ACTION_MOVE),
1, (GdkEvent*)event);

10
moo/mooedit/mooeditprefspage.c
View File

@ -244,7 +244,10 @@ page_get_scheme (MooPrefsDialogPage *page)
g_return_val_if_fail (combo != NULL, NULL);
if (!gtk_combo_box_get_active_iter (combo, &iter))
g_return_val_if_reached (NULL);
{
g_critical ("%s: oops", G_STRLOC);
return NULL;
}
model = gtk_combo_box_get_model (combo);
gtk_tree_model_get (model, &iter, 0, &scheme, -1);
@ -550,7 +553,10 @@ page_get_default_lang (MooPrefsDialogPage *page)
g_return_val_if_fail (combo != NULL, NULL);
if (!gtk_combo_box_get_active_iter (combo, &iter))
g_return_val_if_reached (NULL);
{
g_critical ("%s: oops", G_STRLOC);
return NULL;
}
model = gtk_combo_box_get_model (combo);
gtk_tree_model_get (model, &iter, COLUMN_ID, &lang, -1);

10
moo/mooedit/moolineview.c
View File

@ -259,7 +259,10 @@ moo_line_view_move_cursor (GtkTextView *text_view,
handle = FALSE;
if (!handle)
return GTK_TEXT_VIEW_CLASS(moo_line_view_parent_class)->move_cursor (text_view, step, count, extend_selection);
{
GTK_TEXT_VIEW_CLASS(moo_line_view_parent_class)->move_cursor (text_view, step, count, extend_selection);
return;
}
view = MOO_LINE_VIEW (text_view);
buffer = gtk_text_view_get_buffer (text_view);
@ -599,7 +602,10 @@ moo_line_view_set_boxed (MooLineView *view,
g_return_if_fail (g_type_is_a (type, G_TYPE_BOXED));
if (!data)
return moo_line_view_set_data (view, line, NULL, NULL);
{
moo_line_view_set_data (view, line, NULL, NULL);
return;
}
gval.g_type = 0;
g_value_init (&gval, type);

2
moo/mooedit/plugins/activestrings/as-plugin.c
View File

@ -504,7 +504,7 @@ as_set_match (ASSet *set,
reversed = g_utf8_strreverse (text, -1);
egg_regex_clear (set->regex);
if (egg_regex_match (set->regex, reversed, 0) <= 0)
if (!egg_regex_match (set->regex, reversed, 0))
goto out;
for (i = 0; i < set->n_strings; ++i)

4
moo/moofileview/moobookmarkmgr.c
View File

@ -68,10 +68,6 @@ static MooBookmark *_moo_bookmark_copy (MooBookmark *bookmark);
/* MOO_TYPE_BOOKMARK_MGR */
G_DEFINE_TYPE (MooBookmarkMgr, _moo_bookmark_mgr, G_TYPE_OBJECT)
enum {
PROP_0,
};
enum {
CHANGED,
ACTIVATE,

8
moo/moofileview/moofileview.c
View File

@ -2831,7 +2831,10 @@ fileview_set_filter (MooFileView *fileview,
g_return_if_fail (null_filter != NULL);
if (filter == null_filter)
return fileview_set_filter (fileview, NULL);
{
fileview_set_filter (fileview, NULL);
return;
}
if (filter && (gtk_file_filter_get_needed (filter) & GTK_FILE_FILTER_URI))
{
@ -3791,7 +3794,8 @@ entry_changed (GtkEntry *entry,
else
{
fileview->priv->entry_state = ENTRY_STATE_TYPEAHEAD;
return typeahead_try (fileview, need_to_refilter);
typeahead_try (fileview, need_to_refilter);
return;
}
}

5
moo/moofileview/moofolder.c
View File

@ -839,7 +839,10 @@ file_deleted (MooFolderImpl *impl,
g_return_if_fail (!impl->deleted);
if (!strcmp (name, impl->path))
return folder_emit_deleted (impl);
{
folder_emit_deleted (impl);
return;
}
file = g_hash_table_lookup (impl->files, name);
if (!file) return;

5
moo/moofileview/moofoldermodel.c
View File

@ -678,7 +678,10 @@ moo_folder_model_get_iter_impl (GtkTreeModel *tree_model,
model = MOO_FOLDER_MODEL (tree_model);
if (gtk_tree_path_get_depth (path) != 1)
g_return_val_if_reached (FALSE);
{
g_critical ("%s: oops", G_STRLOC);
return FALSE;
}
index_ = gtk_tree_path_get_indices(path)[0];

40
moo/moofileview/mooiconview.c
View File

@ -1355,17 +1355,23 @@ static void calculate_pixbuf_size (MooIconView *view)
int width, height;
if (!view->priv->pixbuf.show)
return set_pixbuf_size (view, 0, 0);
{
set_pixbuf_size (view, 0, 0);
return;
}
if (view->priv->pixel_icon_size >= 0)
return set_pixbuf_size (view,
view->priv->pixel_icon_size,
view->priv->pixel_icon_size);
if (view->priv->icon_size >= 0)
{
if (gtk_icon_size_lookup (view->priv->icon_size, &width, &height))
return set_pixbuf_size (view, width, height);
set_pixbuf_size (view, view->priv->pixel_icon_size,
view->priv->pixel_icon_size);
return;
}
if (view->priv->icon_size >= 0 &&
gtk_icon_size_lookup (view->priv->icon_size, &width, &height))
{
set_pixbuf_size (view, width, height);
return;
}
g_object_get (view->priv->pixbuf.cell,
@ -1374,7 +1380,10 @@ static void calculate_pixbuf_size (MooIconView *view)
NULL);
if (height >= 0 && width >= 0)
return set_pixbuf_size (view, width, height);
{
set_pixbuf_size (view, width, height);
return;
}
gtk_tree_model_get_iter_first (view->priv->model, &iter);
view->priv->pixbuf.func (view, view->priv->pixbuf.cell,
@ -1404,14 +1413,20 @@ static void calculate_row_height (MooIconView *view)
int height;
if (!view->priv->text.show)
return set_text_height (view, 0);
{
set_text_height (view, 0);
return;
}
g_object_get (view->priv->text.cell,
"height", &height,
NULL);
if (height >= 0)
return set_text_height (view, height);
{
set_text_height (view, height);
return;
}
gtk_tree_model_get_iter_first (view->priv->model, &iter);
view->priv->text.func (view, view->priv->text.cell,
@ -2678,7 +2693,8 @@ _moo_icon_view_select_range (MooIconView *view,
if (selection->mode != GTK_SELECTION_MULTIPLE)
{
g_return_if_fail (!gtk_tree_path_compare (start, end));
return _moo_icon_view_select_path (view, start);
_moo_icon_view_select_path (view, start);
return;
}
start_index = gtk_tree_path_get_indices(start)[0];

24
moo/moofileview/mootreeview.c
View File

@ -502,10 +502,12 @@ _moo_tree_view_unselect_all (MooTreeView *view)
switch (child->type)
{
case MOO_TREE_VIEW_TREE:
return gtk_tree_selection_unselect_all (child->u.tree.selection);
gtk_tree_selection_unselect_all (child->u.tree.selection);
break;
case MOO_TREE_VIEW_ICON:
return _moo_icon_view_unselect_all (child->u.icon.view);
_moo_icon_view_unselect_all (child->u.icon.view);
break;
}
}
@ -620,10 +622,12 @@ _moo_tree_view_set_cursor (MooTreeView *view,
switch (child->type)
{
case MOO_TREE_VIEW_TREE:
return gtk_tree_view_set_cursor (child->u.tree.view, path, NULL, start_editing);
gtk_tree_view_set_cursor (child->u.tree.view, path, NULL, start_editing);
break;
case MOO_TREE_VIEW_ICON:
return _moo_icon_view_set_cursor (child->u.icon.view, path, FALSE);
_moo_icon_view_set_cursor (child->u.icon.view, path, FALSE);
break;
}
}
@ -643,10 +647,12 @@ _moo_tree_view_scroll_to_cell (MooTreeView *view,
switch (child->type)
{
case MOO_TREE_VIEW_TREE:
return gtk_tree_view_scroll_to_cell (child->u.tree.view, path, NULL, FALSE, 0, 0);
gtk_tree_view_scroll_to_cell (child->u.tree.view, path, NULL, FALSE, 0, 0);
break;
case MOO_TREE_VIEW_ICON:
return _moo_icon_view_scroll_to_cell (child->u.icon.view, path);
_moo_icon_view_scroll_to_cell (child->u.icon.view, path);
break;
}
}
@ -667,10 +673,12 @@ _moo_tree_view_selected_foreach (MooTreeView *view,
switch (child->type)
{
case MOO_TREE_VIEW_TREE:
return gtk_tree_selection_selected_foreach (child->u.tree.selection, func, data);
gtk_tree_selection_selected_foreach (child->u.tree.selection, func, data);
break;
case MOO_TREE_VIEW_ICON:
return _moo_icon_view_selected_foreach (child->u.icon.view, func, data);
_moo_icon_view_selected_foreach (child->u.icon.view, func, data);
break;
}
}

29
moo/moopython/moopython-utils.h
View File

@ -46,11 +46,13 @@ char *_moo_py_err_string (void);
void _moo_py_init_print_funcs (void);
#define return_None G_STMT_START {Py_INCREF(Py_None); return Py_None;} G_STMT_END
#define return_Self G_STMT_START {Py_INCREF((PyObject*)self); return (PyObject*)self;} G_STMT_END
#define return_None return Py_INCREF(Py_None), (Py_None)
#define return_Self return Py_INCREF(self), (self)
#define return_True G_STMT_START {Py_INCREF(Py_True); return Py_True;} G_STMT_END
#define return_False G_STMT_START {Py_INCREF(Py_False); return Py_False;} G_STMT_END
#define return_True return Py_INCREF(Py_True), (Py_True)
#define return_False return Py_INCREF(Py_False), (Py_False)
#define return_Int(v) return Py_BuildValue ((char*)"i", (v))
#define return_Bool(v) \
G_STMT_START { \
@ -65,17 +67,14 @@ G_STMT_START { \
} \
} G_STMT_END
#define return_Int(v) return Py_BuildValue ((char*)"i", (v))
#define return_AttrError(msg) G_STMT_START {PyErr_SetString(PyExc_AttributeError, msg); return NULL;} G_STMT_END
#define return_AttrErrorInt(msg) G_STMT_START {PyErr_SetString(PyExc_AttributeError, msg); return -1;} G_STMT_END
#define return_TypeError(msg) G_STMT_START {PyErr_SetString(PyExc_TypeError, msg); return NULL;} G_STMT_END
#define return_TypeErrorInt(msg) G_STMT_START {PyErr_SetString(PyExc_TypeError, msg); return -1;} G_STMT_END
#define return_RuntimeError(msg) G_STMT_START {PyErr_SetString(PyExc_RuntimeError, msg); return NULL;} G_STMT_END
#define return_RuntimeErrorInt(msg) G_STMT_START {PyErr_SetString(PyExc_RuntimeError, msg); return -1;} G_STMT_END
#define return_ValueError(msg) G_STMT_START {PyErr_SetString(PyExc_ValueError, msg); return NULL;} G_STMT_END
#define return_ValueErrorInt(msg) G_STMT_START {PyErr_SetString(PyExc_ValueError, msg); return -1;} G_STMT_END
#define return_AttrError(msg) return PyErr_SetString (PyExc_AttributeError, msg), NULL
#define return_AttrErrorInt(msg) return PyErr_SetString (PyExc_AttributeError, msg), -1
#define return_TypeError(msg) return PyErr_SetString (PyExc_TypeError, msg), NULL
#define return_TypeErrorInt(msg) return PyErr_SetString (PyExc_TypeError, msg), -1
#define return_RuntimeError(msg) return PyErr_SetString (PyExc_RuntimeError, msg), NULL
#define return_RuntimeErrorInt(msg) return PyErr_SetString (PyExc_RuntimeError, msg), -1
#define return_ValueError(msg) return PyErr_SetString (PyExc_ValueError, msg), NULL
#define return_ValueErrorInt(msg) return PyErr_SetString (PyExc_ValueError, msg), -1
G_END_DECLS

22
moo/mooscript/mooscript-parser.c
View File

@ -252,28 +252,22 @@ ms_lex_parse_word (MSLex *lex,
#define NEXT (lex->input[lex->ptr+1])
#define NEXT2 (lex->input[lex->ptr+2])
#define RETURN1(what) \
G_STMT_START { \
lex->ptr += 1; \
return what; \
} G_STMT_END
#define CHECK1(c_, what_) \
G_STMT_START { \
if (THIS == c_) \
RETURN1 (what_); \
} G_STMT_END
#define RETURN2(what) \
G_STMT_START { \
lex->ptr += 2; \
return what; \
{ \
lex->ptr += 1; \
return what_; \
} \
} G_STMT_END
#define CHECK2(c1_, c2_, what_) \
G_STMT_START { \
if (THIS == c1_ && NEXT == c2_) \
RETURN2 (what_); \
{ \
lex->ptr += 2; \
return what_; \
} \
} G_STMT_END

82
moo/mooterm/mooterm-draw.c
View File

@ -152,7 +152,9 @@ _moo_term_font_free (MooTermFont *font)
void
_moo_term_invalidate (MooTerm *term)
{
GdkRectangle rec = {0, 0, term->priv->width, term->priv->height};
GdkRectangle rec = {0, 0, 0, 0};
rec.width = term->priv->width;
rec.height = term->priv->height;
_moo_term_invalidate_screen_rect (term, &rec);
}
@ -163,12 +165,12 @@ _moo_term_invalidate_screen_rect (MooTerm *term,
{
if (GTK_WIDGET_REALIZED (term))
{
GdkRectangle r = {
rect->x * CHAR_WIDTH(term),
rect->y * CHAR_HEIGHT(term),
rect->width * CHAR_WIDTH(term),
rect->height * CHAR_HEIGHT(term)
};
GdkRectangle r;
r.x = rect->x * CHAR_WIDTH(term);
r.y = rect->y * CHAR_HEIGHT(term);
r.width = rect->width * CHAR_WIDTH(term);
r.height = rect->height * CHAR_HEIGHT(term);
gdk_window_invalidate_rect (GTK_WIDGET(term)->window,
&r, FALSE);
@ -426,10 +428,12 @@ moo_term_draw (MooTerm *term,
int top_line = term_top_line (term);
int width = term->priv->width;
int height = term->priv->height;
GdkRectangle clip = {0, 0, width, height};
GdkRectangle clip = {0, 0, 0, 0};
g_return_if_fail (region != NULL);
clip.width = width;
clip.height = height;
gdk_region_get_rectangles (region, &rects, &n_rects);
for (i = 0; i < n_rects; ++i)
@ -465,14 +469,40 @@ rect_screen_to_window (MooTerm *term,
}
inline static void
region_union_with_rect (GdkRegion **region,
GdkRectangle *rect)
static GdkRegion *
region_rectangle (int x,
int y,
int width,
int height)
{
GdkRectangle rect;
rect.x = x;
rect.y = y;
rect.width = width;
rect.height = height;
return gdk_region_rectangle (&rect);
}
static void
region_union_with_rect (GdkRegion **region,
int x,
int y,
int width,
int height)
{
GdkRectangle rect;
rect.x = x;
rect.y = y;
rect.width = width;
rect.height = height;
if (*region)
gdk_region_union_with_rect (*region, rect);
gdk_region_union_with_rect (*region, &rect);
else
*region = gdk_region_rectangle (rect);
*region = gdk_region_rectangle (&rect);
}
@ -480,7 +510,6 @@ gboolean
_moo_term_expose_event (GtkWidget *widget,
GdkEventExpose *event)
{
GdkRectangle text_rec = {0, 0, 0, 0};
GdkRegion *text_region;
MooTerm *term = MOO_TERM (widget);
@ -489,9 +518,7 @@ _moo_term_expose_event (GtkWidget *widget,
g_assert (term_top_line (term) <= buf_scrollback (term->priv->buffer));
text_rec.width = PIXEL_WIDTH (term);
text_rec.height = PIXEL_HEIGHT (term);
text_region = gdk_region_rectangle (&text_rec);
text_region = region_rectangle (0, 0, PIXEL_WIDTH (term), PIXEL_HEIGHT (term));
gdk_region_intersect (text_region, event->region);
if (!gdk_region_empty (text_region))
@ -898,12 +925,11 @@ add_buffer_changed (MooTerm *term)
if (top_line != scrollback)
{
GdkRectangle clip = {0, 0, term->priv->width, height};
GdkRegion *tmp;
gdk_region_offset (changed, 0, scrollback - top_line);
tmp = gdk_region_rectangle (&clip);
tmp = region_rectangle (0, 0, term->priv->width, height);
gdk_region_intersect (changed, tmp);
gdk_region_destroy (tmp);
}
@ -936,7 +962,6 @@ invalidate_window (MooTerm *term)
int scrollback = buf_scrollback (term->priv->buffer);
GdkWindow *window = GTK_WIDGET(term)->window;
gboolean need_redraw = FALSE;
GdkRectangle clip = {0, 0, term->priv->width, term->priv->height};
if (!GTK_WIDGET_DRAWABLE (term))
return FALSE;
@ -967,20 +992,22 @@ invalidate_window (MooTerm *term)
if (term->priv->cursor_col < term->priv->width &&
row >= 0 && row < (int) term->priv->height)
{
GdkRectangle rect = {term->priv->cursor_col, row, 1, 1};
gdk_region_union_with_rect (changed, &rect);
region_union_with_rect (&changed,
term->priv->cursor_col,
row, 1, 1);
}
row = scrollback + term->priv->cursor_row_old - top_line;
if (term->priv->cursor_col_old < term->priv->width &&
row >= 0 && row < (int) term->priv->height)
{
GdkRectangle rect = {term->priv->cursor_col_old, row, 1, 1};
gdk_region_union_with_rect (changed, &rect);
region_union_with_rect (&changed,
term->priv->cursor_col_old,
row, 1, 1);
}
}
clip_region = gdk_region_rectangle (&clip);
clip_region = region_rectangle (0, 0, term->priv->width, term->priv->height);
gdk_region_intersect (changed, clip_region);
gdk_region_destroy (clip_region);
@ -1078,8 +1105,9 @@ _moo_term_buffer_scrolled (MooTermBuffer *buf,
{
if (lines && term->priv->buffer == buf && GTK_WIDGET_DRAWABLE (term))
{
GdkRectangle rect = {0, 0, term->priv->width, term->priv->height};
region_union_with_rect (&term->priv->changed, &rect);
region_union_with_rect (&term->priv->changed, 0, 0,
term->priv->width,
term->priv->height);
add_update_timeout (term);
}
}

5
moo/mooterm/mooterm.c
View File

@ -840,7 +840,10 @@ static void scroll_abs (MooTerm *term,
}
if (line >= buf_scrollback (term->priv->buffer))
return scroll_to_bottom (term, update_adj);
{
scroll_to_bottom (term, update_adj);
return;
}
term->priv->top_line = line;
term->priv->scrolled = TRUE;

32
moo/mooterm/mootermbuffer-private.h
View File

@ -197,24 +197,38 @@ inline static GdkRegion *buf_get_changed(MooTermBuffer *buf)
#define buf_changed_add_rect(buf,rect) \
G_STMT_START { \
if (buf->priv->changed) \
gdk_region_union_with_rect (buf->priv->changed, &rect); \
if ((buf)->priv->changed) \
gdk_region_union_with_rect ((buf)->priv->changed, rect); \
else \
buf->priv->changed = gdk_region_rectangle (&rect); \
(buf)->priv->changed = gdk_region_rectangle (rect); \
} G_STMT_END
#define buf_changed_add_rect_dim(buf,x_,y_,w_,h_) \
G_STMT_START { \
GdkRectangle rect__; \
rect__.x = x_; \
rect__.y = y_; \
rect__.width = w_; \
rect__.height = h_; \
buf_changed_add_rect (buf, &rect__); \
} G_STMT_END
#define buf_changed_add_range(buf, row, start, len) \
G_STMT_START { \
GdkRectangle rec_ = {start, row, len, 1}; \
buf_changed_add_rect (buf, rec_); \
GdkRectangle rec__; \
rec__.x = start; \
rec__.y = row; \
rec__.width = len; \
rec__.height = 1; \
buf_changed_add_rect (buf, &rec__); \
} G_STMT_END
#define buf_changed_set_all(buf) \
G_STMT_START { \
GdkRectangle rec_ = { \
0, 0, buf->priv->screen_width, buf->priv->screen_height \
}; \
buf_changed_add_rect (buf, rec_); \
GdkRectangle rec__ = {0, 0, 0, 0}; \
rec__.width = (buf)->priv->screen_width; \
rec__.height = (buf)->priv->screen_height; \
buf_changed_add_rect (buf, &rec__); \
} G_STMT_END

51
moo/mooterm/mootermbuffer.c
View File

@ -399,13 +399,10 @@ set_screen_width (MooTermBuffer *buf,
if (old_width < width)
{
GdkRectangle changed = {
0, old_width,
buf->priv->screen_height,
width - old_width
};
buf_changed_add_rect (buf, changed);
/* XXX width and height swapped here? */
buf_changed_add_rect_dim (buf, 0, old_width,
buf->priv->screen_height,
width - old_width);
_moo_term_buffer_changed (buf);
}
@ -442,13 +439,12 @@ static void set_screen_height (MooTermBuffer *buf,
if (height > old_height)
{
guint add = height - old_height;
GdkRectangle changed = {0, old_height, width, add};
for (i = 0; i < height - old_height; ++i)
g_ptr_array_add (buf->priv->lines,
_moo_term_line_new (width, buf->priv->current_attr));
buf_changed_add_rect (buf, changed);
buf_changed_add_rect_dim (buf, 0, old_height, width, add);
content_changed = TRUE;
}
else /* height < old_height */
@ -479,13 +475,12 @@ static void set_screen_height (MooTermBuffer *buf,
if (height > old_height)
{
guint add = height - old_height;
GdkRectangle changed = {0, old_height, width, add};
for (i = 0; i < height - old_height; ++i)
g_ptr_array_add (buf->priv->lines,
_moo_term_line_new (width, buf->priv->current_attr));
buf_changed_add_rect (buf, changed);
buf_changed_add_rect_dim (buf, 0, old_height, width, add);
content_changed = TRUE;
}
else /* height < old_height */
@ -1112,10 +1107,6 @@ _moo_term_buffer_index (MooTermBuffer *buf)
if (cursor == bottom)
{
GdkRectangle changed = {
0, buf->priv->top_margin, width, bottom - top + 1
};
delete_line (buf, g_ptr_array_index (buf->priv->lines, top), TRUE, TRUE);
memmove (&buf->priv->lines->pdata[top],
@ -1125,7 +1116,8 @@ _moo_term_buffer_index (MooTermBuffer *buf)
buf->priv->lines->pdata[bottom] =
_moo_term_line_new (width, buf->priv->current_attr);
buf_changed_add_rect (buf, changed);
buf_changed_add_rect_dim (buf, 0, buf->priv->top_margin,
width, bottom - top + 1);
}
else
{
@ -1171,10 +1163,6 @@ _moo_term_buffer_reverse_index (MooTermBuffer *buf)
if (cursor == top)
{
GdkRectangle changed = {
0, buf->priv->top_margin, width, bottom - top + 1
};
delete_line (buf, g_ptr_array_index (buf->priv->lines, bottom), TRUE, TRUE);
memmove (&buf->priv->lines->pdata[top+1],
@ -1184,7 +1172,8 @@ _moo_term_buffer_reverse_index (MooTermBuffer *buf)
buf->priv->lines->pdata[top] =
_moo_term_line_new (width, buf->priv->current_attr);
buf_changed_add_rect (buf, changed);
buf_changed_add_rect_dim (buf, 0, buf->priv->top_margin,
width, bottom - top + 1);
}
else
{
@ -1560,12 +1549,6 @@ _moo_term_buffer_delete_line (MooTermBuffer *buf,
guint bottom = buf->priv->bottom_margin + buf->priv->screen_offset;
guint i;
GdkRectangle changed = {
0, buf->priv->_cursor_row,
buf->priv->screen_width,
bottom - cursor + 1
};
g_return_if_fail (n != 0);
g_return_if_fail (top <= cursor && cursor <= bottom);
@ -1587,7 +1570,9 @@ _moo_term_buffer_delete_line (MooTermBuffer *buf,
_moo_term_line_new (buf->priv->screen_width,
buf->priv->current_attr);
buf_changed_add_rect (buf, changed);
buf_changed_add_rect_dim (buf, 0, buf->priv->_cursor_row,
buf->priv->screen_width,
bottom - cursor + 1);
_moo_term_buffer_changed (buf);
}
@ -1601,12 +1586,6 @@ _moo_term_buffer_insert_line (MooTermBuffer *buf,
guint bottom = buf->priv->bottom_margin + buf->priv->screen_offset;
guint i;
GdkRectangle changed = {
0, buf->priv->_cursor_row,
buf->priv->screen_width,
buf->priv->bottom_margin - buf->priv->_cursor_row + 1
};
g_return_if_fail (n != 0);
g_return_if_fail (top <= cursor && cursor <= bottom);
@ -1628,7 +1607,9 @@ _moo_term_buffer_insert_line (MooTermBuffer *buf,
_moo_term_line_new (buf->priv->screen_width,
buf->priv->current_attr);
buf_changed_add_rect (buf, changed);
buf_changed_add_rect_dim (buf, 0, buf->priv->_cursor_row,
buf->priv->screen_width,
buf->priv->bottom_margin - buf->priv->_cursor_row + 1);
_moo_term_buffer_changed (buf);
}

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

@ -416,9 +416,13 @@ read_child_out (G_GNUC_UNUSED GIOChannel *source,
while (again && !error_occured && current < to_read)
{
struct pollfd fd = {pt->master, POLLIN | POLLPRI, 0};
int res;
struct pollfd fd;
int res = poll (&fd, 1, POLL_TIME);
fd.fd = pt->master;
fd.events = POLLIN | POLLPRI;
fd.revents = 0;
res = poll (&fd, 1, POLL_TIME);
switch (res)
{

10
moo/mooutils/eggregex.c
View File

@ -462,6 +462,11 @@ egg_regex_optimize (EggRegex *regex,
{
const gchar *errmsg;
pcre_extra *extra;
union
{
gpointer *p;
pcre_extra **extra;
} u;
g_return_val_if_fail (regex != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@ -488,11 +493,6 @@ egg_regex_optimize (EggRegex *regex,
return TRUE;
/* hack to silent gcc about strict-aliasing */
union
{
gpointer *p;
pcre_extra **extra;
} u;
u.extra = &extra;
if (!g_atomic_pointer_compare_and_exchange (u.p, NULL, extra))
/* someone else has optimized the regex while this functions was running */

30
moo/mooutils/moobigpaned.c
View File

@ -504,15 +504,15 @@ moo_big_paned_open_pane (MooBigPaned *paned,
GtkWidget *widget)
{
int idx;
MooPaned *child;
MooPaned *child = NULL;
g_return_if_fail (MOO_IS_BIG_PANED (paned));
g_return_if_fail (GTK_IS_WIDGET (widget));
if (!moo_big_paned_find_pane (paned, widget, &child, &idx))
g_return_if_reached ();
moo_big_paned_find_pane (paned, widget, &child, &idx);
g_return_if_fail (child != NULL);
return moo_paned_open_pane (child, idx);
moo_paned_open_pane (child, idx);
}
@ -520,15 +520,15 @@ void
moo_big_paned_hide_pane (MooBigPaned *paned,
GtkWidget *widget)
{
MooPaned *child;
MooPaned *child = NULL;
g_return_if_fail (MOO_IS_BIG_PANED (paned));
g_return_if_fail (GTK_IS_WIDGET (widget));
if (!moo_big_paned_find_pane (paned, widget, &child, NULL))
g_return_if_reached ();
moo_big_paned_find_pane (paned, widget, &child, NULL);
g_return_if_fail (child != NULL);
return moo_paned_hide_pane (child);
moo_paned_hide_pane (child);
}
@ -537,15 +537,15 @@ moo_big_paned_present_pane (MooBigPaned *paned,
GtkWidget *widget)
{
int idx;
MooPaned *child;
MooPaned *child = NULL;
g_return_if_fail (MOO_IS_BIG_PANED (paned));
g_return_if_fail (GTK_IS_WIDGET (widget));
if (!moo_big_paned_find_pane (paned, widget, &child, &idx))
g_return_if_reached ();
moo_big_paned_find_pane (paned, widget, &child, &idx);
g_return_if_fail (child != NULL);
return moo_paned_present_pane (child, idx);
moo_paned_present_pane (child, idx);
}
@ -553,13 +553,13 @@ GtkWidget*
moo_big_paned_get_button (MooBigPaned *paned,
GtkWidget *widget)
{
MooPaned *child;
MooPaned *child = NULL;
g_return_val_if_fail (MOO_IS_BIG_PANED (paned), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
if (!moo_big_paned_find_pane (paned, widget, &child, NULL))
return NULL;
moo_big_paned_find_pane (paned, widget, &child, NULL);
g_return_val_if_fail (child != NULL, NULL);
return moo_paned_get_button (child, widget);
}

22
moo/mooutils/mooencodings-data.h
View File

@ -144,7 +144,9 @@ static const struct {
{"CP20127", "ASCII"},
{"CP20866", "KOI8-R"},
// {"CP21866", "KOI8-RU"},
#if 0
{"CP21866", "KOI8-RU"},
#endif
{"CP936", "GBK"},
{"CP1361", "JOHAB"},
@ -208,12 +210,14 @@ static const struct {
{"CP1252", "WINDOWS-1252"},
{"ANSI-1251", "WINDOWS-1251"},
{"CP1251", "WINDOWS-1251"},
// {"IBM-921", "ISO-8859-13"},
// {"IBM-856", "CP856"},
// {"IBM-922", "CP922"},
// {"IBM-932", "CP932"},
// {"IBM-943", "CP943"},
// {"IBM-1046", "CP1046"},
// {"IBM-1124", "CP1124"},
// {"IBM-1129", "CP1129"},
#if 0
{"IBM-921", "ISO-8859-13"},
{"IBM-856", "CP856"},
{"IBM-922", "CP922"},
{"IBM-932", "CP932"},
{"IBM-943", "CP943"},
{"IBM-1046", "CP1046"},
{"IBM-1124", "CP1124"},
{"IBM-1129", "CP1129"},
#endif
};

33
moo/mooutils/moofilewatch.c
View File

@ -16,6 +16,8 @@
#endif
#ifdef MOO_USE_FAM
/* need PATH_MAX even with -ansi */
#define _GNU_SOURCE
#include <fam.h>
#else
#define WANT_STAT_MONITOR
@ -520,21 +522,12 @@ monitor_free (Monitor *monitor)
#ifdef MOO_USE_FAM
#define SET_FAM_ERROR(func,error) \
G_STMT_START { \
g_set_error (error, MOO_FILE_WATCH_ERROR, \
MOO_FILE_WATCH_ERROR_FAILED, \
#func " failed: %s", \
((FAMErrno && FamErrlist[FAMErrno]) ? \
FamErrlist[FAMErrno] : \
"unknown error")); \
} G_STMT_END
#define RETURN_FAM_ERROR(func,error,ret) \
G_STMT_START { \
SET_FAM_ERROR (func,error); \
return ret; \
} G_STMT_END
"unknown error"))
#define MOO_FAM_SOCKET_WATCH_PRIORITY G_PRIORITY_DEFAULT
@ -550,7 +543,10 @@ watch_fam_start (MooFileWatch *watch,
GIOChannel *fam_socket;
if (FAMOpen (&watch->fam_connection) != 0)
RETURN_FAM_ERROR (FAMOpen, error, FALSE);
{
SET_FAM_ERROR (FAMOpen, error);
return FALSE;
}
#ifdef HAVE_FAMNOEXISTS
FAMNoExists (&watch->fam_connection);
@ -575,9 +571,12 @@ watch_fam_shutdown (MooFileWatch *watch,
g_source_remove (watch->fam_connection_watch);
if (FAMClose (&watch->fam_connection))
RETURN_FAM_ERROR (FAMOpen, error, FALSE);
else
return TRUE;
{
SET_FAM_ERROR (FAMClose, error);
return FALSE;
}
return TRUE;
}
@ -609,9 +608,11 @@ watch_fam_start_monitor (MooFileWatch *watch,
watch->fam_connection.fd, monitor->filename);
if (monitor->isdir)
RETURN_FAM_ERROR (FAMMonitorDirectory, error, FALSE);
SET_FAM_ERROR (FAMMonitorDirectory, error);
else
RETURN_FAM_ERROR (FAMMonitorFile, error, FALSE);
SET_FAM_ERROR (FAMMonitorFile, error);
return FALSE;
}
else
{

5
moo/mooutils/moofiltermgr.c
View File

@ -613,7 +613,10 @@ filter_store_list_user_filters (FilterStore *store)
offset = store->num_builtin + (store->has_separator ? 1 : 0);
if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store->filters), &iter, NULL, offset))
g_return_val_if_reached (NULL);
{
g_critical ("%s: oops", G_STRLOC);
return NULL;
}
do
{

18
moo/mooutils/mooglade.c
View File

@ -1214,14 +1214,16 @@ child_new (MooGladeXML *xml,
return NULL;
}
// if (!strcmp (class_name, "GtkToolbar"))
// {
// g_warning ("Ignoring %s", class_name);
// child = g_new0 (Child, 1);
// child->empty = TRUE;
// child->parent_node = parent;
// return child;
// }
#if 0
if (!strcmp (class_name, "GtkToolbar"))
{
g_warning ("Ignoring %s", class_name);
child = g_new0 (Child, 1);
child->empty = TRUE;
child->parent_node = parent;
return child;
}
#endif
internal_child = moo_markup_get_prop (node, "internal-child");

25
moo/mooutils/moonotebook.c
View File

@ -2698,8 +2698,9 @@ translate_coords (GdkWindow *parent_window,
}
static void tab_drag_start (MooNotebook *nb,
GdkEventMotion *event)
static void
tab_drag_start (MooNotebook *nb,
GdkEventMotion *event)
{
Page *page;
GdkRectangle rect;
@ -2711,7 +2712,10 @@ static void tab_drag_start (MooNotebook *nb,
event_y = event->y;
if (!translate_coords (nb->priv->tab_window, event->window, &event_x, &event_y))
g_return_if_reached ();
{
g_critical ("%s: oops", G_STRLOC);
return;
}
page = nb->priv->current_page;
g_return_if_fail (page != NULL);
@ -2753,7 +2757,10 @@ static void tab_drag_motion (MooNotebook *nb,
event_y = event->y;
if (!translate_coords (nb->priv->tab_window, event->window, &event_x, &event_y))
g_return_if_reached ();
{
g_critical ("%s: oops", G_STRLOC);
return;
}
}
else
{
@ -3155,7 +3162,10 @@ static gboolean moo_notebook_maybe_popup (MooNotebook *nb,
event_y = event->y;
if (!translate_coords (nb->priv->tab_window, event->window, &event_x, &event_y))
g_return_val_if_reached (FALSE);
{
g_critical ("%s: oops", G_STRLOC);
return FALSE;
}
page = find_label_at_xy (nb, event_x, event_y, FALSE);
@ -3182,7 +3192,10 @@ void moo_notebook_set_popup_creation_func(MooNotebook *notebook,
g_return_if_fail (MOO_IS_NOTEBOOK (notebook));
if (!func)
return moo_notebook_set_popup_creation_func (notebook, popup_func, NULL);
{
moo_notebook_set_popup_creation_func (notebook, popup_func, NULL);
return;
}
notebook->priv->popup_func = func;
notebook->priv->popup_user_data = user_data;

7
moo/mooutils/mooprefs.c
View File

@ -880,7 +880,7 @@ closure_match (Closure *closure,
case MOO_PREFS_MATCH_REGEX:
egg_regex_clear (closure->pattern.regex);
return egg_regex_match (closure->pattern.regex, key, 0) > 0;
return egg_regex_match (closure->pattern.regex, key, 0);
default:
g_return_val_if_reached (FALSE);
@ -1524,7 +1524,10 @@ moo_prefs_set_filename (const char *key,
g_return_if_fail (key != NULL);
if (!val)
return moo_prefs_set_string (key, NULL);
{
moo_prefs_set_string (key, NULL);
return;
}
utf8_val = g_filename_display_name (val);

10
moo/mooutils/mooutils-treeview.c
View File

@ -606,7 +606,10 @@ moo_tree_helper_delete_row (MooTreeHelper *helper)
selection = gtk_tree_view_get_selection (helper->widget);
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
g_return_if_reached ();
{
g_critical ("%s: oops", G_STRLOC);
return;
}
path = gtk_tree_model_get_path (model, &iter);
@ -640,7 +643,10 @@ moo_tree_helper_row_move (MooTreeHelper *helper,
selection = gtk_tree_view_get_selection (helper->widget);
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
g_return_if_reached ();
{
g_critical ("%s: oops", G_STRLOC);
return;
}
path = gtk_tree_model_get_path (model, &iter);
new_path = gtk_tree_path_copy (path);

1
moo/mooutils/xdgmime/xdgmimealias.c
View File

@ -29,6 +29,7 @@
#include <config.h>
#endif
#define _GNU_SOURCE
#include "xdgmimealias.h"
#include "xdgmimeint.h"
#include <stdlib.h>

1
moo/mooutils/xdgmime/xdgmimeglob.c
View File

@ -29,6 +29,7 @@
#include <config.h>
#endif
#define _GNU_SOURCE
#include "xdgmimeglob.h"
#include "xdgmimeint.h"
#include <stdlib.h>

1
moo/mooutils/xdgmime/xdgmimemagic.c
View File

@ -29,6 +29,7 @@
#include <config.h>
#endif
#define _GNU_SOURCE
#include <assert.h>
#include "xdgmimemagic.h"
#include "xdgmimeint.h"

1
moo/mooutils/xdgmime/xdgmimeparent.c
View File

@ -29,6 +29,7 @@
#include <config.h>
#endif
#define _GNU_SOURCE
#include "xdgmimeparent.h"
#include "xdgmimeint.h"
#include <stdlib.h>