From a5999b7b7fa289c233b63310013e96e9a27c5896 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 15:15:42 -0800 Subject: [PATCH 001/248] build: branch for GtkSourceView 5 targeting GTK 4 --- README.md | 2 ++ gtksourceview/gtksourceversion.h.in | 18 ++++++++++++++++++ meson.build | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ba6edee8..db887d34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ GtkSourceView ============= +This is a development branch progressing towards GTK 4 support. + GtkSourceView is a GNOME library that extends GtkTextView, the standard GTK+ widget for multiline text editing. GtkSourceView adds support for syntax highlighting, undo/redo, file loading and saving, search and replace, a diff --git a/gtksourceview/gtksourceversion.h.in b/gtksourceview/gtksourceversion.h.in index 032bc3bd..43ebf272 100644 --- a/gtksourceview/gtksourceversion.h.in +++ b/gtksourceview/gtksourceversion.h.in @@ -226,6 +226,16 @@ G_BEGIN_DECLS */ #define GTK_SOURCE_VERSION_4_0 (G_ENCODE_VERSION (4, 0)) +/** + * GTK_SOURCE_VERSION_5_0: + * + * A macro that evaluates to the 5.0 version of GtkSourceView, + * in a format that can be used by the C pre-processor. + * + * Since: 5.0 + */ +#define GTK_SOURCE_VERSION_5_0 (G_ENCODE_VERSION (5, 0)) + /* Define GTK_SOURCE_VERSION_CUR_STABLE */ #ifndef __GTK_DOC_IGNORE__ # if (GTK_SOURCE_MINOR_VERSION % 2) @@ -559,6 +569,14 @@ G_BEGIN_DECLS #endif #endif /* __GTK_DOC_IGNORE__ */ +#ifndef __GTK_DOC_IGNORE__ +#if GTK_SOURCE_VERSION_MAX_ALLOWED < GTK_SOURCE_VERSION_5_0 +#define GTK_SOURCE_AVAILABLE_IN_5_0 G_UNAVAILABLE(5, 0) _GTK_SOURCE_EXTERN +#else +#define GTK_SOURCE_AVAILABLE_IN_5_0 _GTK_SOURCE_EXTERN +#endif +#endif /* __GTK_DOC_IGNORE__ */ + GTK_SOURCE_AVAILABLE_IN_3_20 guint gtk_source_get_major_version (void); diff --git a/meson.build b/meson.build index 845bbec5..12f6aa0f 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gtksourceview', 'c', - version: '4.8.0', + version: '4.99.0', license: 'LGPL-2.1-or-later', meson_version: '>= 0.50.0', default_options: [ 'c_std=gnu99', @@ -20,7 +20,7 @@ version_major = version_arr[0].to_int() version_minor = version_arr[1].to_int() version_micro = version_arr[2].to_int() -api_version = '4' +api_version = '5' lib_version = '0.0.0' lib_version_arr = lib_version.split('.') -- GitLab From 60cf69f2d536ed5344580426225a15e3b757e0f1 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 15:25:10 -0800 Subject: [PATCH 002/248] glade: remove glade catalog support There is no glade for GTK 4 (and unlikely it will continue to exist there in it's current form). This drops the glade bits so we can try to keep things compiling as much as we can during the port to GTK 4. --- data/glade/gtksourceview.xml.in | 44 --------------------------------- data/glade/meson.build | 37 --------------------------- data/meson.build | 4 --- meson.build | 9 ------- meson_options.txt | 4 --- 5 files changed, 98 deletions(-) delete mode 100644 data/glade/gtksourceview.xml.in delete mode 100644 data/glade/meson.build diff --git a/data/glade/gtksourceview.xml.in b/data/glade/gtksourceview.xml.in deleted file mode 100644 index 4b2c2984..00000000 --- a/data/glade/gtksourceview.xml.in +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/glade/meson.build b/data/glade/meson.build deleted file mode 100644 index 3148632b..00000000 --- a/data/glade/meson.build +++ /dev/null @@ -1,37 +0,0 @@ -# Note that we do not install in the detected GLADE_CATALOG_DIR -# since we may not have permissions to do it, for instance if -# compiling with a prefix while glade is installed in /usr. -# We use the variable only to find the dtd file. -# If you install gtksourceview and glade in different prefixes -# and want to use the catalog in glade, you will need to set -# the GLADE_CATALOG_SEARCH_PATH environment variable. - -catalog_in = configuration_data() -catalog_in.set('GSV_API_VERSION', api_version) - -catalog_xml = configure_file( - input: 'gtksourceview.xml.in', - output: 'gtksourceview.xml', - configuration: catalog_in, - install_dir: join_paths(datadir, 'glade', 'catalogs') -) - -# Currently DTD validation does not work with glade's DTD. -# This does not appear to be limited to GtkSourceView. -#if xmllint_prg.found() -# catalog_dtd = join_paths( -# gladeui_dep.get_pkgconfig_variable('catalogdir'), -# 'glade-catalog.dtd' -# ) -# -# test( -# 'Validate Glade catalogue', -# xmllint_prg, -# args: [ -# '--dtdvalid', -# catalog_dtd, -# catalog_xml, -# '--noout', -# ] -# ) -#endif diff --git a/data/meson.build b/data/meson.build index 2ca97a5f..45387d48 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,7 +1,3 @@ -if install_glade_catalog - subdir('glade') -endif - install_subdir('language-specs', install_dir: pkgdatadir, exclude_files: [ 'Makefile.am', diff --git a/meson.build b/meson.build index 12f6aa0f..6e55c3a1 100644 --- a/meson.build +++ b/meson.build @@ -59,7 +59,6 @@ testdatadir = join_paths(datadir, 'installed-tests', package_string) docpath = join_paths(datadir, 'gtk-doc', 'html', package_string) # Options -install_glade_catalog = get_option('glade_catalog') generate_gir = get_option('gir') generate_vapi = generate_gir and get_option('vapi') build_gtk_doc = get_option('gtk_doc') @@ -75,7 +74,6 @@ libm_dep = cc.find_library('m', required: false) glib_req = '>= @0@'.format(glib_req_version) gtk_req = '>= @0@'.format(gtk_req_version) libxml_req = '>= 2.6' -gladeui_req = '>= 3.9' introspection_req = '>= 1.42.0' gtk_doc_req = '>= 1.25' fribidi_req = '>= 0.19.7' @@ -89,12 +87,6 @@ fribidi_dep = dependency('fribidi', version: fribidi_req) gtk_quartz_dep = dependency('gtk+-quartz-3.0', version: gtk_doc_req, required: false) -if install_glade_catalog - gladeui_dep = dependency('gladeui-2.0', version: gladeui_req) -else - gladeui_dep = [] -endif - if generate_gir introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req) else @@ -293,7 +285,6 @@ summary = [ 'GtkSourceView @0@ (@1@)'.format(version, api_version), '', ' Documentation: @0@'.format(build_gtk_doc), - ' Glade catalog: @0@'.format(install_glade_catalog), ' Install tests: @0@'.format(get_option('install_tests')), ' Introspection: @0@'.format(generate_gir), ' Vala vapi: @0@'.format(generate_vapi), diff --git a/meson_options.txt b/meson_options.txt index a58139e0..2ded0af0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,7 +1,3 @@ -option('glade_catalog', - type: 'boolean', value: false, - description: 'Whether to install Glade catalog') - option('install_tests', type: 'boolean', value: false, description: 'Install test programs') -- GitLab From e4379c6dfe20c3fd5b2c61cdcddf10a900992c8a Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 15:29:14 -0800 Subject: [PATCH 003/248] add .editorconfig --- .editorconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1ce82239 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf + +[*.[ch]] +indent_size = 8 +indent_style = tab +insert_final_newline = true +max_line_length = 80 +tab_width = 8 + +[meson.build] +indent_size = 2 +indent_style = space -- GitLab From 6f5a8b49680ac6f84863d91c6441a59007aa9dd2 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 15:46:24 -0800 Subject: [PATCH 004/248] build: switch to #pragma once As we start moving to GTK 4, I really want GtkSourceView to take some steps to modernize. We'll be requiring fairly recent compilers simply with the dependency of GTK 4, so let's start using the features provided to us. --- gtksourceview/gtksource.h | 5 +---- gtksourceview/gtksourceautocleanups.h | 5 +---- gtksourceview/gtksourcebuffer-private.h | 5 +---- gtksourceview/gtksourcebuffer.h | 5 +---- gtksourceview/gtksourcebufferinputstream.h | 5 +---- gtksourceview/gtksourcebufferinternal.h | 5 +---- gtksourceview/gtksourcebufferoutputstream.h | 5 +---- gtksourceview/gtksourcecompletion-private.h | 6 +----- gtksourceview/gtksourcecompletion.h | 5 +---- gtksourceview/gtksourcecompletioncontainer.h | 5 +---- gtksourceview/gtksourcecompletioncontext.h | 5 +---- gtksourceview/gtksourcecompletioninfo.h | 5 +---- gtksourceview/gtksourcecompletionitem.h | 5 +---- gtksourceview/gtksourcecompletionmodel.h | 5 +---- gtksourceview/gtksourcecompletionproposal.h | 5 +---- gtksourceview/gtksourcecompletionprovider.h | 5 +---- gtksourceview/gtksourcecontextengine.h | 5 +---- gtksourceview/gtksourceencoding-private.h | 5 +---- gtksourceview/gtksourceencoding.h | 5 +---- gtksourceview/gtksourceengine.h | 5 +---- gtksourceview/gtksourcefile.h | 5 +---- gtksourceview/gtksourcefileloader.h | 5 +---- gtksourceview/gtksourcefilesaver.h | 5 +---- gtksourceview/gtksourcegutter-private.h | 5 +---- gtksourceview/gtksourcegutter.h | 5 +---- gtksourceview/gtksourcegutterrenderer-private.h | 5 +---- gtksourceview/gtksourcegutterrenderer.h | 5 +---- gtksourceview/gtksourcegutterrendererlines.h | 5 +---- gtksourceview/gtksourcegutterrenderermarks.h | 5 +---- gtksourceview/gtksourcegutterrendererpixbuf.h | 5 +---- gtksourceview/gtksourcegutterrenderertext.h | 5 +---- gtksourceview/gtksourceinit.h | 5 +---- gtksourceview/gtksourceiter.h | 5 +---- gtksourceview/gtksourcelanguage-private.h | 6 +----- gtksourceview/gtksourcelanguage.h | 6 +----- gtksourceview/gtksourcelanguagemanager.h | 5 +---- gtksourceview/gtksourcemap.h | 5 +---- gtksourceview/gtksourcemark.h | 5 +---- gtksourceview/gtksourcemarkattributes.h | 5 +---- gtksourceview/gtksourcemarkssequence.h | 5 +---- gtksourceview/gtksourcepixbufhelper.h | 6 +----- gtksourceview/gtksourceprintcompositor.h | 5 +---- gtksourceview/gtksourceregex.h | 5 +---- gtksourceview/gtksourceregion.h | 5 +---- gtksourceview/gtksourcesearchcontext.h | 5 +---- gtksourceview/gtksourcesearchsettings.h | 5 +---- gtksourceview/gtksourcespacedrawer-private.h | 5 +---- gtksourceview/gtksourcespacedrawer.h | 5 +---- gtksourceview/gtksourcestyle-private.h | 5 +---- gtksourceview/gtksourcestyle.h | 5 +---- gtksourceview/gtksourcestylescheme.h | 5 +---- gtksourceview/gtksourcestyleschemechooser.h | 5 +---- gtksourceview/gtksourcestyleschemechooserbutton.h | 5 +---- gtksourceview/gtksourcestyleschemechooserwidget.h | 5 +---- gtksourceview/gtksourcestyleschememanager.h | 5 +---- gtksourceview/gtksourcetag.h | 5 +---- gtksourceview/gtksourcetypes-private.h | 5 +---- gtksourceview/gtksourcetypes.h | 5 +---- gtksourceview/gtksourceundomanager.h | 5 +---- gtksourceview/gtksourceundomanagerdefault.h | 5 +---- gtksourceview/gtksourceutils-private.h | 5 +---- gtksourceview/gtksourceutils.h | 5 +---- gtksourceview/gtksourceview.h | 5 +---- 63 files changed, 63 insertions(+), 256 deletions(-) diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h index e1ae114b..fcd5a6fc 100644 --- a/gtksourceview/gtksource.h +++ b/gtksourceview/gtksource.h @@ -15,8 +15,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_H -#define GTK_SOURCE_H +#pragma once #define GTK_SOURCE_H_INSIDE @@ -63,5 +62,3 @@ #include #undef GTK_SOURCE_H_INSIDE - -#endif /* GTK_SOURCE_H */ diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 9929368a..550fa1c4 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -15,8 +15,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_AUTOCLEANUPS_H -#define GTK_SOURCE_AUTOCLEANUPS_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -59,5 +58,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceView, g_object_unref) #endif /* __GI_SCANNER__ */ G_END_DECLS - -#endif /* GTK_SOURCE_AUTOCLEANUPS_H */ diff --git a/gtksourceview/gtksourcebuffer-private.h b/gtksourceview/gtksourcebuffer-private.h index 5fcf12b9..8bbb83bc 100644 --- a/gtksourceview/gtksourcebuffer-private.h +++ b/gtksourceview/gtksourcebuffer-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_BUFFER_PRIVATE_H -#define GTK_SOURCE_BUFFER_PRIVATE_H +#pragma once #include @@ -89,5 +88,3 @@ GTK_SOURCE_INTERNAL gboolean _gtk_source_buffer_has_spaces_tag (GtkSourceBuffer *buffer); G_END_DECLS - -#endif /* GTK_SOURCE_BUFFER_PRIVATE_H */ diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h index 09143a87..b6b147ff 100644 --- a/gtksourceview/gtksourcebuffer.h +++ b/gtksourceview/gtksourcebuffer.h @@ -22,8 +22,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_BUFFER_H -#define GTK_SOURCE_BUFFER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -275,5 +274,3 @@ GtkTextTag *gtk_source_buffer_create_source_tag (GtkSourceBuffer *buff ...); G_END_DECLS - -#endif /* GTK_SOURCE_BUFFER_H */ diff --git a/gtksourceview/gtksourcebufferinputstream.h b/gtksourceview/gtksourcebufferinputstream.h index f98cb64c..5f5054a3 100644 --- a/gtksourceview/gtksourcebufferinputstream.h +++ b/gtksourceview/gtksourcebufferinputstream.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_BUFFER_INPUT_STREAM_H -#define GTK_SOURCE_BUFFER_INPUT_STREAM_H +#pragma once #include #include @@ -68,5 +67,3 @@ GTK_SOURCE_INTERNAL gsize _gtk_source_buffer_input_stream_tell (GtkSourceBufferInputStream *stream); G_END_DECLS - -#endif /* GTK_SOURCE_BUFFER_INPUT_STREAM_H */ diff --git a/gtksourceview/gtksourcebufferinternal.h b/gtksourceview/gtksourcebufferinternal.h index 856d320e..9cc9762c 100644 --- a/gtksourceview/gtksourcebufferinternal.h +++ b/gtksourceview/gtksourcebufferinternal.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_BUFFER_INTERNAL_H -#define GTK_SOURCE_BUFFER_INTERNAL_H +#pragma once #include #include "gtksourcetypes.h" @@ -43,5 +42,3 @@ void _gtk_source_buffer_internal_emit_search_start (GtkSourceBufferInternal *b GtkSourceSearchContext *search_context); G_END_DECLS - -#endif /* GTK_SOURCE_BUFFER_INTERNAL_H */ diff --git a/gtksourceview/gtksourcebufferoutputstream.h b/gtksourceview/gtksourcebufferoutputstream.h index f1a16fd9..f4c4df96 100644 --- a/gtksourceview/gtksourcebufferoutputstream.h +++ b/gtksourceview/gtksourcebufferoutputstream.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_BUFFER_OUTPUT_STREAM_H -#define GTK_SOURCE_BUFFER_OUTPUT_STREAM_H +#pragma once #include #include "gtksourcetypes.h" @@ -73,5 +72,3 @@ guint gtk_source_buffer_output_stream_get_num_fallbacks (GtkSourceBufferOutputStream *stream); G_END_DECLS - -#endif /* GTK_SOURCE_BUFFER_OUTPUT_STREAM_H */ diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtksourcecompletion-private.h index 05fafb63..ab276d32 100644 --- a/gtksourceview/gtksourcecompletion-private.h +++ b/gtksourceview/gtksourcecompletion-private.h @@ -18,14 +18,10 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_PIVATE_H -#define GTK_SOURCE_COMPLETION_PIVATE_H +#pragma once #include #include G_GNUC_INTERNAL GtkSourceCompletion *gtk_source_completion_new (GtkSourceView *source_view); - -#endif /* GTK_SOURCE_COMPLETION_PIVATE_H */ - diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h index a5dfd924..fef8967d 100644 --- a/gtksourceview/gtksourcecompletion.h +++ b/gtksourceview/gtksourcecompletion.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_H -#define GTK_SOURCE_COMPLETION_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -152,5 +151,3 @@ void _gtk_source_completion_add_proposals (GtkSourceCompletion *com GList *proposals, gboolean finished); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_H */ diff --git a/gtksourceview/gtksourcecompletioncontainer.h b/gtksourceview/gtksourcecompletioncontainer.h index 7f262cc1..657f9e58 100644 --- a/gtksourceview/gtksourcecompletioncontainer.h +++ b/gtksourceview/gtksourcecompletioncontainer.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_CONTAINER_H -#define GTK_SOURCE_COMPLETION_CONTAINER_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -53,5 +52,3 @@ GtkSourceCompletionContainer * _gtk_source_completion_container_new (void); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_CONTAINER_H */ diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h index c4d146b7..03b37456 100644 --- a/gtksourceview/gtksourcecompletioncontext.h +++ b/gtksourceview/gtksourcecompletioncontext.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_CONTEXT_H -#define GTK_SOURCE_COMPLETION_CONTEXT_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -98,5 +97,3 @@ G_GNUC_INTERNAL void _gtk_source_completion_context_cancel (GtkSourceCompletionContext *context); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_CONTEXT_H */ diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h index bbd2759f..151c0b69 100644 --- a/gtksourceview/gtksourcecompletioninfo.h +++ b/gtksourceview/gtksourcecompletioninfo.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_INFO_H -#define GTK_SOURCE_COMPLETION_INFO_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -73,5 +72,3 @@ void _gtk_source_completion_info_set_xoffset (GtkSourceCompletionInfo *info, gint xoffset); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_INFO_H */ diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h index 0f9e5b9c..0f296af2 100644 --- a/gtksourceview/gtksourcecompletionitem.h +++ b/gtksourceview/gtksourcecompletionitem.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_ITEM_H -#define GTK_SOURCE_COMPLETION_ITEM_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -88,5 +87,3 @@ void gtk_source_completion_item_set_info (GtkSourceCompletionItem *item, const gchar *info); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_ITEM_H */ diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h index 85004f00..fac3ab47 100644 --- a/gtksourceview/gtksourcecompletionmodel.h +++ b/gtksourceview/gtksourcecompletionmodel.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_MODEL_H -#define GTK_SOURCE_COMPLETION_MODEL_H +#pragma once #include #include "gtksourcetypes.h" @@ -125,5 +124,3 @@ gboolean gtk_source_completion_model_iter_equal (GtkSourceCompletionModel * GtkTreeIter *iter2); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_MODEL_H */ diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtksourcecompletionproposal.h index 82858798..9a608593 100644 --- a/gtksourceview/gtksourcecompletionproposal.h +++ b/gtksourceview/gtksourcecompletionproposal.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_PROPOSAL_H -#define GTK_SOURCE_COMPLETION_PROPOSAL_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -122,5 +121,3 @@ gboolean gtk_source_completion_proposal_equal (GtkSourceCompletionProposal *p GtkSourceCompletionProposal *other); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_PROPOSAL_H */ diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h index 0560e720..66bf311f 100644 --- a/gtksourceview/gtksourcecompletionprovider.h +++ b/gtksourceview/gtksourcecompletionprovider.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_COMPLETION_PROVIDER_H -#define GTK_SOURCE_COMPLETION_PROVIDER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -162,5 +161,3 @@ GTK_SOURCE_AVAILABLE_IN_ALL gint gtk_source_completion_provider_get_priority (GtkSourceCompletionProvider *provider); G_END_DECLS - -#endif /* GTK_SOURCE_COMPLETION_PROVIDER_H */ diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h index 147e2ba3..7ada68bb 100644 --- a/gtksourceview/gtksourcecontextengine.h +++ b/gtksourceview/gtksourcecontextengine.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_CONTEXT_ENGINE_H -#define GTK_SOURCE_CONTEXT_ENGINE_H +#pragma once #include "gtksourceengine.h" #include "gtksourcetypes.h" @@ -140,5 +139,3 @@ void _gtk_source_context_data_set_escape_char (GtkSourceContextData *data, gunichar esc_char); G_END_DECLS - -#endif /* GTK_SOURCE_CONTEXT_ENGINE_H */ diff --git a/gtksourceview/gtksourceencoding-private.h b/gtksourceview/gtksourceencoding-private.h index cd9e73db..0503ab09 100644 --- a/gtksourceview/gtksourceencoding-private.h +++ b/gtksourceview/gtksourceencoding-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_ENCODING_PRIVATE_H -#define GTK_SOURCE_ENCODING_PRIVATE_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -47,5 +46,3 @@ GSList * _gtk_source_encoding_remove_duplicates (GSList * GtkSourceEncodingDuplicates removal_type); G_END_DECLS - -#endif /* GTK_SOURCE_ENCODING_PRIVATE_H */ diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtksourceencoding.h index 25fb9371..ede28c03 100644 --- a/gtksourceview/gtksourceencoding.h +++ b/gtksourceview/gtksourceencoding.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_ENCODING_H -#define GTK_SOURCE_ENCODING_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -70,5 +69,3 @@ GTK_SOURCE_AVAILABLE_IN_3_14 void gtk_source_encoding_free (GtkSourceEncoding *enc); G_END_DECLS - -#endif /* GTK_SOURCE_ENCODING_H */ diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h index c6ecb850..db416446 100644 --- a/gtksourceview/gtksourceengine.h +++ b/gtksourceview/gtksourceengine.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_ENGINE_H -#define GTK_SOURCE_ENGINE_H +#pragma once #include #include "gtksourcetypes.h" @@ -85,5 +84,3 @@ void _gtk_source_engine_set_style_scheme (GtkSourceEngine *engine, GtkSourceStyleScheme *scheme); G_END_DECLS - -#endif /* GTK_SOURCE_ENGINE_H */ diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h index 0e6b0163..a29dfc55 100644 --- a/gtksourceview/gtksourcefile.h +++ b/gtksourceview/gtksourcefile.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_FILE_H -#define GTK_SOURCE_FILE_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -193,5 +192,3 @@ void _gtk_source_file_set_readonly (GtkSourceFile *file, gboolean readonly); G_END_DECLS - -#endif /* GTK_SOURCE_FILE_H */ diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtksourcefileloader.h index 70fff263..9778bd66 100644 --- a/gtksourceview/gtksourcefileloader.h +++ b/gtksourceview/gtksourcefileloader.h @@ -21,8 +21,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_FILE_LOADER_H -#define GTK_SOURCE_FILE_LOADER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -136,5 +135,3 @@ GtkSourceCompressionType gtk_source_file_loader_get_compression_type (GtkSourceFileLoader *loader); G_END_DECLS - -#endif /* GTK_SOURCE_FILE_LOADER_H */ diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtksourcefilesaver.h index 5bb014e4..2cd1b05b 100644 --- a/gtksourceview/gtksourcefilesaver.h +++ b/gtksourceview/gtksourcefilesaver.h @@ -21,8 +21,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_FILE_SAVER_H -#define GTK_SOURCE_FILE_SAVER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -164,5 +163,3 @@ gboolean gtk_source_file_saver_save_finish (GtkSourceFileSaver *saver, GError **error); G_END_DECLS - -#endif /* GTK_SOURCE_FILE_SAVER_H */ diff --git a/gtksourceview/gtksourcegutter-private.h b/gtksourceview/gtksourcegutter-private.h index 46136f84..f823d38e 100644 --- a/gtksourceview/gtksourcegutter-private.h +++ b/gtksourceview/gtksourcegutter-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_PRIVATE_H -#define GTK_SOURCE_GUTTER_PRIVATE_H +#pragma once #include #include "gtksourcetypes.h" @@ -37,5 +36,3 @@ void _gtk_source_gutter_draw (GtkSourceGutter *gutter, G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_PRIVATE_H */ diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h index d24fcfc4..2cee6d6b 100644 --- a/gtksourceview/gtksourcegutter.h +++ b/gtksourceview/gtksourcegutter.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_H -#define GTK_SOURCE_GUTTER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -89,5 +88,3 @@ GtkSourceGutterRenderer * gint y); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_H */ diff --git a/gtksourceview/gtksourcegutterrenderer-private.h b/gtksourceview/gtksourcegutterrenderer-private.h index df024bf7..af8bcf66 100644 --- a/gtksourceview/gtksourcegutterrenderer-private.h +++ b/gtksourceview/gtksourcegutterrenderer-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H -#define GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H +#pragma once #include #include "gtksourcetypes.h" @@ -32,5 +31,3 @@ void _gtk_source_gutter_renderer_set_view (GtkSourceGutterRenderer *rend GtkTextWindowType window_type); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H */ diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h index 4f0621c4..16334b6f 100644 --- a/gtksourceview/gtksourcegutterrenderer.h +++ b/gtksourceview/gtksourcegutterrenderer.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_RENDERER_H -#define GTK_SOURCE_GUTTER_RENDERER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -268,5 +267,3 @@ void gtk_source_gutter_renderer_query_data (GtkSourceGutterRenderer GtkSourceGutterRendererState state); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_RENDERER_H */ diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtksourcegutterrendererlines.h index 2fc8e22a..f1467e78 100644 --- a/gtksourceview/gtksourcegutterrendererlines.h +++ b/gtksourceview/gtksourcegutterrendererlines.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_RENDERER_LINES_H -#define GTK_SOURCE_GUTTER_RENDERER_LINES_H +#pragma once #include #include "gtksourcetypes.h" @@ -64,5 +63,3 @@ G_GNUC_INTERNAL GtkSourceGutterRenderer *gtk_source_gutter_renderer_lines_new (void); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_RENDERER_LINES_H */ diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h index e807f6c8..4be6a5d0 100644 --- a/gtksourceview/gtksourcegutterrenderermarks.h +++ b/gtksourceview/gtksourcegutterrenderermarks.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_RENDERER_MARKS_H -#define GTK_SOURCE_GUTTER_RENDERER_MARKS_H +#pragma once #include #include "gtksourcetypes.h" @@ -55,5 +54,3 @@ G_GNUC_INTERNAL GtkSourceGutterRenderer *gtk_source_gutter_renderer_marks_new (void); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_RENDERER_MARKS_H */ diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h index 0a7ec487..d5db0cce 100644 --- a/gtksourceview/gtksourcegutterrendererpixbuf.h +++ b/gtksourceview/gtksourcegutterrendererpixbuf.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H -#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -87,5 +86,3 @@ GTK_SOURCE_AVAILABLE_IN_ALL const gchar *gtk_source_gutter_renderer_pixbuf_get_icon_name (GtkSourceGutterRendererPixbuf *renderer); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_RENDERER_TEXT_H */ diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h index 4767a24d..c1167621 100644 --- a/gtksourceview/gtksourcegutterrenderertext.h +++ b/gtksourceview/gtksourcegutterrenderertext.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_GUTTER_RENDERER_TEXT_H -#define GTK_SOURCE_GUTTER_RENDERER_TEXT_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -88,5 +87,3 @@ void gtk_source_gutter_renderer_text_measure_markup (GtkSourceGutterRendererText gint *height); G_END_DECLS - -#endif /* GTK_SOURCE_GUTTER_RENDERER_TEXT_H */ diff --git a/gtksourceview/gtksourceinit.h b/gtksourceview/gtksourceinit.h index 4047d1b3..f0c46a3b 100644 --- a/gtksourceview/gtksourceinit.h +++ b/gtksourceview/gtksourceinit.h @@ -17,8 +17,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_INIT_H -#define GTK_SOURCE_INIT_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -36,5 +35,3 @@ GTK_SOURCE_AVAILABLE_IN_4_0 void gtk_source_finalize (void); G_END_DECLS - -#endif /* GTK_SOURCE_INIT_H */ diff --git a/gtksourceview/gtksourceiter.h b/gtksourceview/gtksourceiter.h index d4bacf00..75b918c7 100644 --- a/gtksourceview/gtksourceiter.h +++ b/gtksourceview/gtksourceiter.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_ITER_H -#define GTK_SOURCE_ITER_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -93,5 +92,3 @@ GTK_SOURCE_INTERNAL gboolean _gtk_source_iter_inside_word (const GtkTextIter *iter); G_END_DECLS - -#endif /* GTK_SOURCE_ITER_H */ diff --git a/gtksourceview/gtksourcelanguage-private.h b/gtksourceview/gtksourcelanguage-private.h index 80bf7eac..e38bfda6 100644 --- a/gtksourceview/gtksourcelanguage-private.h +++ b/gtksourceview/gtksourcelanguage-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_LANGUAGE_PRIVATE_H -#define GTK_SOURCE_LANGUAGE_PRIVATE_H +#pragma once #include #include "gtksourcecontextengine.h" @@ -98,6 +97,3 @@ G_GNUC_INTERNAL void _gtk_source_style_info_free (GtkSourceStyleInfo *info); G_END_DECLS - -#endif /* GTK_SOURCE_LANGUAGE_PRIVATE_H */ - diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h index c27c9b4d..59d6f425 100644 --- a/gtksourceview/gtksourcelanguage.h +++ b/gtksourceview/gtksourcelanguage.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_LANGUAGE_H -#define GTK_SOURCE_LANGUAGE_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -93,6 +92,3 @@ const gchar *gtk_source_language_get_style_fallback (GtkSourceLanguage *language const gchar *style_id); G_END_DECLS - -#endif /* GTK_SOURCE_LANGUAGE_H */ - diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h index 219b165a..a145544c 100644 --- a/gtksourceview/gtksourcelanguagemanager.h +++ b/gtksourceview/gtksourcelanguagemanager.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_LANGUAGE_MANAGER_H -#define GTK_SOURCE_LANGUAGE_MANAGER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -88,5 +87,3 @@ G_GNUC_INTERNAL GtkSourceLanguageManager *_gtk_source_language_manager_peek_default (void); G_END_DECLS - -#endif /* GTK_SOURCE_LANGUAGE_MANAGER_H */ diff --git a/gtksourceview/gtksourcemap.h b/gtksourceview/gtksourcemap.h index 99cd9608..532b0cb8 100644 --- a/gtksourceview/gtksourcemap.h +++ b/gtksourceview/gtksourcemap.h @@ -17,8 +17,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_MAP_H -#define GTK_SOURCE_MAP_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -66,5 +65,3 @@ GTK_SOURCE_AVAILABLE_IN_3_18 GtkSourceView *gtk_source_map_get_view (GtkSourceMap *map); G_END_DECLS - -#endif /* GTK_SOURCE_MAP_H */ diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h index 60608e63..2b44c8c2 100644 --- a/gtksourceview/gtksourcemark.h +++ b/gtksourceview/gtksourcemark.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTKSOURCEMARK_H -#define GTKSOURCEMARK_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -75,5 +74,3 @@ GtkSourceMark *gtk_source_mark_prev (GtkSourceMark *mark, const gchar *category); G_END_DECLS - -#endif /* GTKSOURCEMARK_H */ diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h index 86891309..1a9a58af 100644 --- a/gtksourceview/gtksourcemarkattributes.h +++ b/gtksourceview/gtksourcemarkattributes.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_MARK_ATTRIBUTES_H -#define GTK_SOURCE_MARK_ATTRIBUTES_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -108,5 +107,3 @@ gchar *gtk_source_mark_attributes_get_tooltip_markup (GtkSourceMarkAt GtkSourceMark *mark); G_END_DECLS - -#endif /* GTK_SOURCE_MARK_ATTRIBUTES_H */ diff --git a/gtksourceview/gtksourcemarkssequence.h b/gtksourceview/gtksourcemarkssequence.h index 57293e63..0c498ff1 100644 --- a/gtksourceview/gtksourcemarkssequence.h +++ b/gtksourceview/gtksourcemarkssequence.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_MARKS_SEQUENCE_H -#define GTK_SOURCE_MARKS_SEQUENCE_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -91,5 +90,3 @@ GSList *_gtk_source_marks_sequence_get_marks_in_range (GtkSourceMarksSequence const GtkTextIter *iter2); G_END_DECLS - -#endif /* GTK_SOURCE_MARKS_SEQUENCE_H */ diff --git a/gtksourceview/gtksourcepixbufhelper.h b/gtksourceview/gtksourcepixbufhelper.h index d37338bd..aea01860 100644 --- a/gtksourceview/gtksourcepixbufhelper.h +++ b/gtksourceview/gtksourcepixbufhelper.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_PIXBUF_HELPER_H -#define GTK_SOURCE_PIXBUF_HELPER_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -55,6 +54,3 @@ G_GNUC_INTERNAL GdkPixbuf *gtk_source_pixbuf_helper_render (GtkSourcePixbufHelper *helper, GtkWidget *widget, gint size); - -#endif /* GTK_SOURCE_PIXBUF_HELPER_H */ - diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h index f29db3cd..f070eb51 100644 --- a/gtksourceview/gtksourceprintcompositor.h +++ b/gtksourceview/gtksourceprintcompositor.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_PRINT_COMPOSITOR_H -#define GTK_SOURCE_PRINT_COMPOSITOR_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -219,5 +218,3 @@ void gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compo gint page_nr); G_END_DECLS - -#endif /* GTK_SOURCE_PRINT_COMPOSITOR_H */ diff --git a/gtksourceview/gtksourceregex.h b/gtksourceview/gtksourceregex.h index edf9d6b7..22fbf1c0 100644 --- a/gtksourceview/gtksourceregex.h +++ b/gtksourceview/gtksourceregex.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_REGEX_H -#define GTK_SOURCE_REGEX_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -80,5 +79,3 @@ GTK_SOURCE_INTERNAL const gchar *_gtk_source_regex_get_pattern (GtkSourceRegex *regex); G_END_DECLS - -#endif /* GTK_SOURCE_REGEX_H */ diff --git a/gtksourceview/gtksourceregion.h b/gtksourceview/gtksourceregion.h index ad9a80f4..db1d00bd 100644 --- a/gtksourceview/gtksourceregion.h +++ b/gtksourceview/gtksourceregion.h @@ -19,8 +19,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_REGION_H -#define GTK_SOURCE_REGION_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -123,5 +122,3 @@ GTK_SOURCE_AVAILABLE_IN_3_22 gchar * gtk_source_region_to_string (GtkSourceRegion *region); G_END_DECLS - -#endif /* GTK_SOURCE_REGION_H */ diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtksourcesearchcontext.h index fd489036..86797b5e 100644 --- a/gtksourceview/gtksourcesearchcontext.h +++ b/gtksourceview/gtksourcesearchcontext.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_SEARCH_CONTEXT_H -#define GTK_SOURCE_SEARCH_CONTEXT_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -157,5 +156,3 @@ void _gtk_source_search_context_update_highlight (GtkSourceSearchContext *s gboolean synchronous); G_END_DECLS - -#endif /* GTK_SOURCE_SEARCH_CONTEXT_H */ diff --git a/gtksourceview/gtksourcesearchsettings.h b/gtksourceview/gtksourcesearchsettings.h index b6140c02..a20571d2 100644 --- a/gtksourceview/gtksourcesearchsettings.h +++ b/gtksourceview/gtksourcesearchsettings.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_SEARCH_SETTINGS_H -#define GTK_SOURCE_SEARCH_SETTINGS_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -96,5 +95,3 @@ GTK_SOURCE_AVAILABLE_IN_ALL gboolean gtk_source_search_settings_get_regex_enabled (GtkSourceSearchSettings *settings); G_END_DECLS - -#endif /* GTK_SOURCE_SEARCH_SETTINGS_H */ diff --git a/gtksourceview/gtksourcespacedrawer-private.h b/gtksourceview/gtksourcespacedrawer-private.h index 3b6060fa..6480d757 100644 --- a/gtksourceview/gtksourcespacedrawer-private.h +++ b/gtksourceview/gtksourcespacedrawer-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_SPACE_DRAWER_PRIVATE_H -#define GTK_SOURCE_SPACE_DRAWER_PRIVATE_H +#pragma once #include #include "gtksourcetypes.h" @@ -37,5 +36,3 @@ void _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer, cairo_t *cr); G_END_DECLS - -#endif /* GTK_SOURCE_SPACE_DRAWER_PRIVATE_H */ diff --git a/gtksourceview/gtksourcespacedrawer.h b/gtksourceview/gtksourcespacedrawer.h index b06f5d2d..94095e3b 100644 --- a/gtksourceview/gtksourcespacedrawer.h +++ b/gtksourceview/gtksourcespacedrawer.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_SPACE_DRAWER_H -#define GTK_SOURCE_SPACE_DRAWER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -140,5 +139,3 @@ void gtk_source_space_drawer_bind_matrix_setting (GtkSourceSpaceDrawer *drawer GSettingsBindFlags flags); G_END_DECLS - -#endif /* GTK_SOURCE_SPACE_DRAWER_H */ diff --git a/gtksourceview/gtksourcestyle-private.h b/gtksourceview/gtksourcestyle-private.h index 7ae94e08..41f37dcc 100644 --- a/gtksourceview/gtksourcestyle-private.h +++ b/gtksourceview/gtksourcestyle-private.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_STYLE_PRIVATE_H -#define GTK_SOURCE_STYLE_PRIVATE_H +#pragma once #include @@ -67,5 +66,3 @@ struct _GtkSourceStyle }; G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_PRIVATE_H */ diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtksourcestyle.h index b60d2e6d..ed816091 100644 --- a/gtksourceview/gtksourcestyle.h +++ b/gtksourceview/gtksourcestyle.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_STYLE_H -#define GTK_SOURCE_STYLE_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -50,5 +49,3 @@ void gtk_source_style_apply (const GtkSourceStyle *style, GtkTextTag *tag); G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_H */ diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h index 177878c6..44623eb3 100644 --- a/gtksourceview/gtksourcestylescheme.h +++ b/gtksourceview/gtksourcestylescheme.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_STYLE_SCHEME_H -#define GTK_SOURCE_STYLE_SCHEME_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -115,5 +114,3 @@ gboolean _gtk_source_style_scheme_get_background_pattern_color (GtkSourceStyle GdkRGBA *color); G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_SCHEME_H */ diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h index c32d4175..255db641 100644 --- a/gtksourceview/gtksourcestyleschemechooser.h +++ b/gtksourceview/gtksourcestyleschemechooser.h @@ -18,8 +18,7 @@ * along with GtkSourceView. If not, see . */ -#ifndef GTK_SOURCE_STYLE_SCHEME_CHOOSER_H -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -62,5 +61,3 @@ void gtk_source_style_scheme_chooser_set_style_scheme GtkSourceStyleScheme *scheme); G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_SCHEME_CHOOSER_H */ diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h b/gtksourceview/gtksourcestyleschemechooserbutton.h index 06fe648a..4d58edd8 100644 --- a/gtksourceview/gtksourcestyleschemechooserbutton.h +++ b/gtksourceview/gtksourcestyleschemechooserbutton.h @@ -19,8 +19,7 @@ * along with GtkSourceView. If not, see . */ -#ifndef GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -60,5 +59,3 @@ GTK_SOURCE_AVAILABLE_IN_3_16 GtkWidget *gtk_source_style_scheme_chooser_button_new (void); G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H */ diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.h b/gtksourceview/gtksourcestyleschemechooserwidget.h index 3e4242bd..67e5e95d 100644 --- a/gtksourceview/gtksourcestyleschemechooserwidget.h +++ b/gtksourceview/gtksourcestyleschemechooserwidget.h @@ -19,8 +19,7 @@ * along with GtkSourceView. If not, see . */ -#ifndef GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_H -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -60,5 +59,3 @@ GTK_SOURCE_AVAILABLE_IN_3_16 GtkWidget *gtk_source_style_scheme_chooser_widget_new (void); G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_H */ diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h index c7795b4e..e97077d0 100644 --- a/gtksourceview/gtksourcestyleschememanager.h +++ b/gtksourceview/gtksourcestyleschememanager.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_STYLE_SCHEME_MANAGER_H -#define GTK_SOURCE_STYLE_SCHEME_MANAGER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -96,5 +95,3 @@ GtkSourceStyleSchemeManager * _gtk_source_style_scheme_manager_peek_default (void); G_END_DECLS - -#endif /* GTK_SOURCE_STYLE_SCHEME_MANAGER_H */ diff --git a/gtksourceview/gtksourcetag.h b/gtksourceview/gtksourcetag.h index 73857682..2164eb1f 100644 --- a/gtksourceview/gtksourcetag.h +++ b/gtksourceview/gtksourcetag.h @@ -20,8 +20,7 @@ * Author: Sébastien Wilmet */ -#ifndef GTK_SOURCE_TAG_H -#define GTK_SOURCE_TAG_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -50,5 +49,3 @@ GTK_SOURCE_AVAILABLE_IN_3_20 GtkTextTag * gtk_source_tag_new (const gchar *name); G_END_DECLS - -#endif /* GTK_SOURCE_TAG_H */ diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h index fbed7d95..74a21847 100644 --- a/gtksourceview/gtksourcetypes-private.h +++ b/gtksourceview/gtksourcetypes-private.h @@ -17,8 +17,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_TYPES_PRIVATE_H -#define GTK_SOURCE_TYPES_PRIVATE_H +#pragma once #include @@ -45,5 +44,3 @@ typedef struct _GtkSourceUndoManagerDefault GtkSourceUndoManagerDefault; #endif G_END_DECLS - -#endif /* GTK_SOURCE_TYPES_PRIVATE_H */ diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h index 57c28160..b0bd0d38 100644 --- a/gtksourceview/gtksourcetypes.h +++ b/gtksourceview/gtksourcetypes.h @@ -17,8 +17,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_TYPES_H -#define GTK_SOURCE_TYPES_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -69,5 +68,3 @@ typedef struct _GtkSourceUndoManager GtkSourceUndoManager; typedef struct _GtkSourceView GtkSourceView; G_END_DECLS - -#endif /* GTK_SOURCE_TYPES_H */ diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtksourceundomanager.h index d7ae23f7..90d978de 100644 --- a/gtksourceview/gtksourceundomanager.h +++ b/gtksourceview/gtksourceundomanager.h @@ -20,8 +20,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_UNDO_MANAGER_H -#define GTK_SOURCE_UNDO_MANAGER_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -86,5 +85,3 @@ GTK_SOURCE_AVAILABLE_IN_ALL void gtk_source_undo_manager_can_redo_changed (GtkSourceUndoManager *manager); G_END_DECLS - -#endif /* GTK_SOURCE_UNDO_MANAGER_H */ diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtksourceundomanagerdefault.h index 6010bf2b..1897c33b 100644 --- a/gtksourceview/gtksourceundomanagerdefault.h +++ b/gtksourceview/gtksourceundomanagerdefault.h @@ -20,8 +20,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_UNDO_MANAGER_DEFAULT_H -#define GTK_SOURCE_UNDO_MANAGER_DEFAULT_H +#pragma once #include #include "gtksourcetypes-private.h" @@ -58,5 +57,3 @@ void gtk_source_undo_manager_default_set_max_undo_levels (GtkSourceUndoManagerDe gint max_undo_levels); G_END_DECLS - -#endif /* GTK_SOURCE_UNDO_MANAGER_DEFAULT_H */ diff --git a/gtksourceview/gtksourceutils-private.h b/gtksourceview/gtksourceutils-private.h index 217c38cd..bd8688a3 100644 --- a/gtksourceview/gtksourceutils-private.h +++ b/gtksourceview/gtksourceutils-private.h @@ -20,8 +20,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_UTILS_PRIVATE_H -#define GTK_SOURCE_UTILS_PRIVATE_H +#pragma once #include #include @@ -52,5 +51,3 @@ gchar * _gtk_source_utils_dgettext (const gchar *domain, const gchar *msgid) G_GNUC_FORMAT(2); G_END_DECLS - -#endif /* GTK_SOURCE_UTILS_PRIVATE_H */ diff --git a/gtksourceview/gtksourceutils.h b/gtksourceview/gtksourceutils.h index 4968dff7..97fe6d8e 100644 --- a/gtksourceview/gtksourceutils.h +++ b/gtksourceview/gtksourceutils.h @@ -18,8 +18,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_UTILS_H -#define GTK_SOURCE_UTILS_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -37,5 +36,3 @@ GTK_SOURCE_AVAILABLE_IN_3_10 gchar *gtk_source_utils_escape_search_text (const gchar *text); G_END_DECLS - -#endif /* GTK_SOURCE_UTILS_H */ diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h index 8e8031f9..b7c08f45 100644 --- a/gtksourceview/gtksourceview.h +++ b/gtksourceview/gtksourceview.h @@ -20,8 +20,7 @@ * along with this library; if not, see . */ -#ifndef GTK_SOURCE_VIEW_H -#define GTK_SOURCE_VIEW_H +#pragma once #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) #error "Only can be included directly." @@ -262,5 +261,3 @@ GtkSourceSpaceDrawer * gtk_source_view_get_space_drawer (GtkSourceView *view); G_END_DECLS - -#endif /* end of GTK_SOURCE_VIEW_H */ -- GitLab From c759aa5bde749bde49d2e2af03668499d30869d4 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 15:57:53 -0800 Subject: [PATCH 005/248] copyright: make copyright headers more homogeneous The (C) has no legal meaning and it would be nice to have these cleaned up a bit more so they are the same everywhere if someone has the time to go and do that. --- gtksourceview/gtksourcebuffer-private.h | 2 +- gtksourceview/gtksourcebuffer.c | 10 +++++----- gtksourceview/gtksourcebuffer.h | 10 +++++----- gtksourceview/gtksourcebufferinputstream.c | 4 ++-- gtksourceview/gtksourcebufferinputstream.h | 4 ++-- gtksourceview/gtksourcebufferinternal.c | 2 +- gtksourceview/gtksourcebufferinternal.h | 2 +- gtksourceview/gtksourcebufferoutputstream.c | 4 ++-- gtksourceview/gtksourcebufferoutputstream.h | 4 ++-- gtksourceview/gtksourcecompletion-private.h | 2 +- gtksourceview/gtksourcecompletion.c | 6 +++--- gtksourceview/gtksourcecompletion.h | 4 ++-- gtksourceview/gtksourcecompletioncontainer.c | 2 +- gtksourceview/gtksourcecompletioncontainer.h | 2 +- gtksourceview/gtksourcecompletioncontext.c | 2 +- gtksourceview/gtksourcecompletioncontext.h | 2 +- gtksourceview/gtksourcecompletioninfo.c | 6 +++--- gtksourceview/gtksourcecompletioninfo.h | 4 ++-- gtksourceview/gtksourcecompletionitem.c | 4 ++-- gtksourceview/gtksourcecompletionitem.h | 4 ++-- gtksourceview/gtksourcecompletionmodel.c | 4 ++-- gtksourceview/gtksourcecompletionmodel.h | 2 +- gtksourceview/gtksourcecompletionproposal.c | 4 ++-- gtksourceview/gtksourcecompletionproposal.h | 4 ++-- gtksourceview/gtksourcecompletionprovider.c | 4 ++-- gtksourceview/gtksourcecompletionprovider.h | 4 ++-- gtksourceview/gtksourcecontextengine.c | 4 ++-- gtksourceview/gtksourcecontextengine.h | 4 ++-- gtksourceview/gtksourceencoding-private.h | 2 +- gtksourceview/gtksourceencoding.c | 6 +++--- gtksourceview/gtksourceencoding.h | 4 ++-- gtksourceview/gtksourceengine.c | 2 +- gtksourceview/gtksourceengine.h | 2 +- gtksourceview/gtksourcefile.c | 2 +- gtksourceview/gtksourcefile.h | 2 +- gtksourceview/gtksourcefileloader.c | 8 ++++---- gtksourceview/gtksourcefileloader.h | 8 ++++---- gtksourceview/gtksourcefilesaver.c | 8 ++++---- gtksourceview/gtksourcefilesaver.h | 8 ++++---- gtksourceview/gtksourcegutter-private.h | 2 +- gtksourceview/gtksourcegutter.c | 2 +- gtksourceview/gtksourcegutter.h | 2 +- gtksourceview/gtksourcegutterrenderer-private.h | 2 +- gtksourceview/gtksourcegutterrenderer.c | 2 +- gtksourceview/gtksourcegutterrenderer.h | 2 +- gtksourceview/gtksourcegutterrendererlines.c | 2 +- gtksourceview/gtksourcegutterrendererlines.h | 2 +- gtksourceview/gtksourcegutterrenderermarks.c | 2 +- gtksourceview/gtksourcegutterrenderermarks.h | 2 +- gtksourceview/gtksourcegutterrendererpixbuf.c | 2 +- gtksourceview/gtksourcegutterrendererpixbuf.h | 2 +- gtksourceview/gtksourcegutterrenderertext.c | 2 +- gtksourceview/gtksourcegutterrenderertext.h | 2 +- gtksourceview/gtksourceinit.c | 2 +- gtksourceview/gtksourceinit.h | 2 +- gtksourceview/gtksourceiter.c | 2 +- gtksourceview/gtksourceiter.h | 2 +- gtksourceview/gtksourcelanguage-parser-2.c | 4 ++-- gtksourceview/gtksourcelanguage-private.h | 2 +- gtksourceview/gtksourcelanguage.c | 2 +- gtksourceview/gtksourcelanguage.h | 2 +- gtksourceview/gtksourcelanguagemanager.c | 2 +- gtksourceview/gtksourcelanguagemanager.h | 2 +- gtksourceview/gtksourcemap.c | 4 ++-- gtksourceview/gtksourcemap.h | 4 ++-- gtksourceview/gtksourcemark.c | 2 +- gtksourceview/gtksourcemark.h | 2 +- gtksourceview/gtksourcemarkattributes.c | 4 ++-- gtksourceview/gtksourcemarkattributes.h | 4 ++-- gtksourceview/gtksourcemarkssequence.c | 2 +- gtksourceview/gtksourcemarkssequence.h | 2 +- gtksourceview/gtksourcepixbufhelper.c | 2 +- gtksourceview/gtksourcepixbufhelper.h | 2 +- gtksourceview/gtksourceprintcompositor.c | 10 +++++----- gtksourceview/gtksourceprintcompositor.h | 4 ++-- gtksourceview/gtksourceregex.c | 4 ++-- gtksourceview/gtksourceregex.h | 4 ++-- gtksourceview/gtksourceregion.c | 4 ++-- gtksourceview/gtksourceregion.h | 4 ++-- gtksourceview/gtksourcesearchcontext.c | 2 +- gtksourceview/gtksourcesearchcontext.h | 2 +- gtksourceview/gtksourcesearchsettings.c | 2 +- gtksourceview/gtksourcesearchsettings.h | 2 +- gtksourceview/gtksourcespacedrawer-private.h | 2 +- gtksourceview/gtksourcespacedrawer.c | 12 ++++++------ gtksourceview/gtksourcespacedrawer.h | 2 +- gtksourceview/gtksourcestyle-private.h | 2 +- gtksourceview/gtksourcestyle.c | 2 +- gtksourceview/gtksourcestyle.h | 2 +- gtksourceview/gtksourcestylescheme.c | 2 +- gtksourceview/gtksourcestylescheme.h | 2 +- gtksourceview/gtksourcestyleschemechooser.c | 2 +- gtksourceview/gtksourcestyleschemechooser.h | 2 +- gtksourceview/gtksourcestyleschemechooserbutton.c | 4 ++-- gtksourceview/gtksourcestyleschemechooserbutton.h | 4 ++-- gtksourceview/gtksourcestyleschemechooserwidget.c | 4 ++-- gtksourceview/gtksourcestyleschemechooserwidget.h | 4 ++-- gtksourceview/gtksourcestyleschememanager.c | 2 +- gtksourceview/gtksourcestyleschememanager.h | 2 +- gtksourceview/gtksourcetag.c | 2 +- gtksourceview/gtksourcetag.h | 2 +- gtksourceview/gtksourcetypes-private.h | 2 +- gtksourceview/gtksourcetypes.h | 2 +- gtksourceview/gtksourceundomanager.c | 6 +++--- gtksourceview/gtksourceundomanager.h | 6 +++--- gtksourceview/gtksourceundomanagerdefault.c | 8 ++++---- gtksourceview/gtksourceundomanagerdefault.h | 6 +++--- gtksourceview/gtksourceutils-private.h | 6 +++--- gtksourceview/gtksourceutils.c | 8 ++++---- gtksourceview/gtksourceutils.h | 2 +- gtksourceview/gtksourceversion.c | 2 +- gtksourceview/gtksourceview.c | 8 ++++---- gtksourceview/gtksourceview.h | 6 +++--- 113 files changed, 197 insertions(+), 197 deletions(-) diff --git a/gtksourceview/gtksourcebuffer-private.h b/gtksourceview/gtksourcebuffer-private.h index 8bbb83bc..2b86e14d 100644 --- a/gtksourceview/gtksourcebuffer-private.h +++ b/gtksourceview/gtksourcebuffer-private.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013, 2016 - Sébastien Wilmet + * Copyright 2013, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c index 57c8a437..8e7d507c 100644 --- a/gtksourceview/gtksourcebuffer.c +++ b/gtksourceview/gtksourcebuffer.c @@ -2,11 +2,11 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 1999-2002 - Mikael Hermansson , - * Chris Phelps and - * Jeroen Zwartepoorte - * Copyright (C) 2003 - Paolo Maggi and - * Gustavo Giráldez + * Copyright 1999-2002 - Mikael Hermansson , + * Chris Phelps and + * Jeroen Zwartepoorte + * Copyright 2003 - Paolo Maggi and + * Gustavo Giráldez * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h index b6b147ff..40307380 100644 --- a/gtksourceview/gtksourcebuffer.h +++ b/gtksourceview/gtksourcebuffer.h @@ -2,11 +2,11 @@ * * This file is part of GtkSourceView * - * Copyright (C) 1999-2002 - Mikael Hermansson , - * Chris Phelps and - * Jeroen Zwartepoorte - * Copyright (C) 2003 - Paolo Maggi, Gustavo Giráldez - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 1999-2002 - Mikael Hermansson , + * Chris Phelps and + * Jeroen Zwartepoorte + * Copyright 2003 - Paolo Maggi, Gustavo Giráldez + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebufferinputstream.c b/gtksourceview/gtksourcebufferinputstream.c index 1174222c..764ef378 100644 --- a/gtksourceview/gtksourcebufferinputstream.c +++ b/gtksourceview/gtksourcebufferinputstream.c @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2010 - Ignacio Casal Quinteiro - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2010 - Ignacio Casal Quinteiro + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebufferinputstream.h b/gtksourceview/gtksourcebufferinputstream.h index 5f5054a3..12deeadb 100644 --- a/gtksourceview/gtksourcebufferinputstream.h +++ b/gtksourceview/gtksourcebufferinputstream.h @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2010 - Ignacio Casal Quinteiro - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2010 - Ignacio Casal Quinteiro + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebufferinternal.c b/gtksourceview/gtksourcebufferinternal.c index a41d17c8..ca6632d8 100644 --- a/gtksourceview/gtksourcebufferinternal.c +++ b/gtksourceview/gtksourcebufferinternal.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2016 - Sébastien Wilmet + * Copyright 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebufferinternal.h b/gtksourceview/gtksourcebufferinternal.h index 9cc9762c..55ce0907 100644 --- a/gtksourceview/gtksourcebufferinternal.h +++ b/gtksourceview/gtksourcebufferinternal.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2016 - Sébastien Wilmet + * Copyright 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebufferoutputstream.c b/gtksourceview/gtksourcebufferoutputstream.c index 77a2a113..250ace20 100644 --- a/gtksourceview/gtksourcebufferoutputstream.c +++ b/gtksourceview/gtksourcebufferoutputstream.c @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2010 - Ignacio Casal Quinteiro - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2010 - Ignacio Casal Quinteiro + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcebufferoutputstream.h b/gtksourceview/gtksourcebufferoutputstream.h index f4c4df96..dd54b050 100644 --- a/gtksourceview/gtksourcebufferoutputstream.h +++ b/gtksourceview/gtksourcebufferoutputstream.h @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2010 - Ignacio Casal Quinteiro - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2010 - Ignacio Casal Quinteiro + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtksourcecompletion-private.h index ab276d32..21a1cf26 100644 --- a/gtksourceview/gtksourcecompletion-private.h +++ b/gtksourceview/gtksourcecompletion-private.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c index 15cdf27a..63eb6be6 100644 --- a/gtksourceview/gtksourcecompletion.c +++ b/gtksourceview/gtksourcecompletion.c @@ -2,9 +2,9 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2007 -2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2007-2009 Jesús Barbero Rodríguez + * Copyright 2009 Jesse van den Kieboom + * Copyright 2013 Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h index fef8967d..030c30e3 100644 --- a/gtksourceview/gtksourcecompletion.h +++ b/gtksourceview/gtksourcecompletion.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2007 - 2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletioncontainer.c b/gtksourceview/gtksourcecompletioncontainer.c index 0e28adc5..e28434b1 100644 --- a/gtksourceview/gtksourcecompletioncontainer.c +++ b/gtksourceview/gtksourcecompletioncontainer.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013, 2014, 2016 - Sébastien Wilmet + * Copyright 2013, 2014, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletioncontainer.h b/gtksourceview/gtksourcecompletioncontainer.h index 657f9e58..36436e94 100644 --- a/gtksourceview/gtksourcecompletioncontainer.h +++ b/gtksourceview/gtksourcecompletioncontainer.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c index 0c31956e..f78c6007 100644 --- a/gtksourceview/gtksourcecompletioncontext.c +++ b/gtksourceview/gtksourcecompletioncontext.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h index 03b37456..72d07eac 100644 --- a/gtksourceview/gtksourcecompletioncontext.h +++ b/gtksourceview/gtksourcecompletioncontext.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c index 714c1327..362c8465 100644 --- a/gtksourceview/gtksourcecompletioninfo.c +++ b/gtksourceview/gtksourcecompletioninfo.c @@ -2,9 +2,9 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2007 -2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom - * Copyright (C) 2012 - Sébastien Wilmet + * Copyright 2007-2009 Jesús Barbero Rodríguez + * Copyright 2009 Jesse van den Kieboom + * Copyright 2012 Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h index 151c0b69..8c169f20 100644 --- a/gtksourceview/gtksourcecompletioninfo.h +++ b/gtksourceview/gtksourcecompletioninfo.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2007 - 2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c index 049ff4e3..b07b5c7c 100644 --- a/gtksourceview/gtksourcecompletionitem.c +++ b/gtksourceview/gtksourcecompletionitem.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom - * Copyright (C) 2016 - Sébastien Wilmet + * Copyright 2009 - Jesse van den Kieboom + * Copyright 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h index 0f296af2..750786ef 100644 --- a/gtksourceview/gtksourcecompletionitem.h +++ b/gtksourceview/gtksourcecompletionitem.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom - * Copyright (C) 2016 - Sébastien Wilmet + * Copyright 2009 - Jesse van den Kieboom + * Copyright 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionmodel.c b/gtksourceview/gtksourcecompletionmodel.c index 73facc77..5588f59a 100644 --- a/gtksourceview/gtksourcecompletionmodel.c +++ b/gtksourceview/gtksourcecompletionmodel.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2009 - Jesse van den Kieboom + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h index fac3ab47..9dd79894 100644 --- a/gtksourceview/gtksourcecompletionmodel.h +++ b/gtksourceview/gtksourcecompletionmodel.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionproposal.c b/gtksourceview/gtksourcecompletionproposal.c index 54417c7b..faa2dfdd 100644 --- a/gtksourceview/gtksourcecompletionproposal.c +++ b/gtksourceview/gtksourcecompletionproposal.c @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2007 - 2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtksourcecompletionproposal.h index 9a608593..b92d6d8b 100644 --- a/gtksourceview/gtksourcecompletionproposal.h +++ b/gtksourceview/gtksourcecompletionproposal.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2007 - 2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionprovider.c b/gtksourceview/gtksourcecompletionprovider.c index 4dfcdba5..c31ec248 100644 --- a/gtksourceview/gtksourcecompletionprovider.c +++ b/gtksourceview/gtksourcecompletionprovider.c @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2007 - 2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h index 66bf311f..493d9966 100644 --- a/gtksourceview/gtksourcecompletionprovider.h +++ b/gtksourceview/gtksourcecompletionprovider.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2007 - 2009 Jesús Barbero Rodríguez - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c index 13554f8f..c31218e8 100644 --- a/gtksourceview/gtksourcecontextengine.c +++ b/gtksourceview/gtksourcecontextengine.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez - * Copyright (C) 2005, 2006 - Marco Barisione, Emanuele Aina + * Copyright 2003 - Gustavo Giráldez + * Copyright 2005, 2006 - Marco Barisione, Emanuele Aina * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h index 7ada68bb..acf79990 100644 --- a/gtksourceview/gtksourcecontextengine.h +++ b/gtksourceview/gtksourcecontextengine.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez - * Copyright (C) 2005 - Marco Barisione, Emanuele Aina + * Copyright 2003 - Gustavo Giráldez + * Copyright 2005 - Marco Barisione, Emanuele Aina * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceencoding-private.h b/gtksourceview/gtksourceencoding-private.h index 0503ab09..44c6f85c 100644 --- a/gtksourceview/gtksourceencoding-private.h +++ b/gtksourceview/gtksourceencoding-private.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceencoding.c b/gtksourceview/gtksourceencoding.c index 5e5cdeb3..9c0ece9d 100644 --- a/gtksourceview/gtksourceencoding.c +++ b/gtksourceview/gtksourceencoding.c @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2002-2005 - Paolo Maggi - * Copyright (C) 2014, 2015 - Sébastien Wilmet + * Copyright 2002-2005 - Paolo Maggi + * Copyright 2014, 2015 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,7 +58,7 @@ G_DEFINE_BOXED_TYPE (GtkSourceEncoding, gtk_source_encoding, /* * The original versions of the following tables are taken from profterm * - * Copyright (C) 2002 Red Hat, Inc. + * Copyright 2002 Red Hat, Inc. */ typedef enum _GtkSourceEncodingIndex diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtksourceencoding.h index ede28c03..e2a4e35c 100644 --- a/gtksourceview/gtksourceencoding.h +++ b/gtksourceview/gtksourceencoding.h @@ -2,8 +2,8 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2002-2005 - Paolo Maggi - * Copyright (C) 2014, 2015 - Sébastien Wilmet + * Copyright 2002-2005 - Paolo Maggi + * Copyright 2014, 2015 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceengine.c b/gtksourceview/gtksourceengine.c index 94ff2224..77600d5d 100644 --- a/gtksourceview/gtksourceengine.c +++ b/gtksourceview/gtksourceengine.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez + * Copyright 2003 - Gustavo Giráldez * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h index db416446..5db91982 100644 --- a/gtksourceview/gtksourceengine.h +++ b/gtksourceview/gtksourceengine.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez + * Copyright 2003 - Gustavo Giráldez * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c index 16d60965..1e58422e 100644 --- a/gtksourceview/gtksourcefile.c +++ b/gtksourceview/gtksourcefile.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2014, 2015 - Sébastien Wilmet + * Copyright 2014, 2015 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h index a29dfc55..e4d1bbb1 100644 --- a/gtksourceview/gtksourcefile.h +++ b/gtksourceview/gtksourcefile.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2014, 2015 - Sébastien Wilmet + * Copyright 2014, 2015 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c index 381caec3..b9b58450 100644 --- a/gtksourceview/gtksourcefileloader.c +++ b/gtksourceview/gtksourcefileloader.c @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2005 - Paolo Maggi - * Copyright (C) 2007 - Paolo Maggi, Steve Frécinaux - * Copyright (C) 2008 - Jesse van den Kieboom - * Copyright (C) 2014, 2016 - Sébastien Wilmet + * Copyright 2005 - Paolo Maggi + * Copyright 2007 - Paolo Maggi, Steve Frécinaux + * Copyright 2008 - Jesse van den Kieboom + * Copyright 2014, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtksourcefileloader.h index 9778bd66..1f45380f 100644 --- a/gtksourceview/gtksourcefileloader.h +++ b/gtksourceview/gtksourcefileloader.h @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2005 - Paolo Maggi - * Copyright (C) 2007 - Paolo Maggi, Steve Frécinaux - * Copyright (C) 2008 - Jesse van den Kieboom - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2005 - Paolo Maggi + * Copyright 2007 - Paolo Maggi, Steve Frécinaux + * Copyright 2008 - Jesse van den Kieboom + * Copyright 2014 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c index 600efc65..dad85ae3 100644 --- a/gtksourceview/gtksourcefilesaver.c +++ b/gtksourceview/gtksourcefilesaver.c @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2005-2007 - Paolo Borelli and Paolo Maggi - * Copyright (C) 2007 - Steve Frécinaux - * Copyright (C) 2008 - Jesse van den Kieboom - * Copyright (C) 2014, 2016 - Sébastien Wilmet + * Copyright 2005-2007 - Paolo Borelli and Paolo Maggi + * Copyright 2007 - Steve Frécinaux + * Copyright 2008 - Jesse van den Kieboom + * Copyright 2014, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtksourcefilesaver.h index 2cd1b05b..b835bea9 100644 --- a/gtksourceview/gtksourcefilesaver.h +++ b/gtksourceview/gtksourcefilesaver.h @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2005, 2007 - Paolo Maggi - * Copyrhing (C) 2007 - Steve Frécinaux - * Copyright (C) 2008 - Jesse van den Kieboom - * Copyright (C) 2014 - Sébastien Wilmet + * Copyright 2005, 2007 Paolo Maggi + * Copyright 2007 Steve Frécinaux + * Copyright 2008 Jesse van den Kieboom + * Copyright 2014 Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutter-private.h b/gtksourceview/gtksourcegutter-private.h index f823d38e..ae40663e 100644 --- a/gtksourceview/gtksourcegutter-private.h +++ b/gtksourceview/gtksourcegutter-private.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c index de019b8d..015bb361 100644 --- a/gtksourceview/gtksourcegutter.c +++ b/gtksourceview/gtksourcegutter.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h index 2cee6d6b..97247ed1 100644 --- a/gtksourceview/gtksourcegutter.h +++ b/gtksourceview/gtksourcegutter.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2009 - Jesse van den Kieboom + * Copyright 2009 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderer-private.h b/gtksourceview/gtksourcegutterrenderer-private.h index af8bcf66..5dc5dfd4 100644 --- a/gtksourceview/gtksourcegutterrenderer-private.h +++ b/gtksourceview/gtksourcegutterrenderer-private.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Krzesimir Nowak + * Copyright 2010 - Krzesimir Nowak * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c index 5ef7fba9..9d31465c 100644 --- a/gtksourceview/gtksourcegutterrenderer.c +++ b/gtksourceview/gtksourcegutterrenderer.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h index 16334b6f..8a7ff106 100644 --- a/gtksourceview/gtksourcegutterrenderer.h +++ b/gtksourceview/gtksourcegutterrenderer.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrendererlines.c b/gtksourceview/gtksourcegutterrendererlines.c index 7c5b3020..2d63d0df 100644 --- a/gtksourceview/gtksourcegutterrendererlines.c +++ b/gtksourceview/gtksourcegutterrendererlines.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtksourcegutterrendererlines.h index f1467e78..5077f68a 100644 --- a/gtksourceview/gtksourcegutterrendererlines.h +++ b/gtksourceview/gtksourcegutterrendererlines.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderermarks.c b/gtksourceview/gtksourcegutterrenderermarks.c index 8fdcb6df..b85e65d5 100644 --- a/gtksourceview/gtksourcegutterrenderermarks.c +++ b/gtksourceview/gtksourcegutterrenderermarks.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h index 4be6a5d0..480d5ffc 100644 --- a/gtksourceview/gtksourcegutterrenderermarks.h +++ b/gtksourceview/gtksourcegutterrenderermarks.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c index 82da75bf..f7924111 100644 --- a/gtksourceview/gtksourcegutterrendererpixbuf.c +++ b/gtksourceview/gtksourcegutterrendererpixbuf.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h index d5db0cce..b34f4dda 100644 --- a/gtksourceview/gtksourcegutterrendererpixbuf.h +++ b/gtksourceview/gtksourcegutterrendererpixbuf.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderertext.c b/gtksourceview/gtksourcegutterrenderertext.c index 982cb608..4246ee9b 100644 --- a/gtksourceview/gtksourcegutterrenderertext.c +++ b/gtksourceview/gtksourcegutterrenderertext.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h index c1167621..c9c91812 100644 --- a/gtksourceview/gtksourcegutterrenderertext.h +++ b/gtksourceview/gtksourcegutterrenderertext.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceinit.c b/gtksourceview/gtksourceinit.c index 0f6d9dcd..0dda887f 100644 --- a/gtksourceview/gtksourceinit.c +++ b/gtksourceview/gtksourceinit.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2016, 2017 - Sébastien Wilmet + * Copyright 2016, 2017 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceinit.h b/gtksourceview/gtksourceinit.h index f0c46a3b..bacfb95f 100644 --- a/gtksourceview/gtksourceinit.h +++ b/gtksourceview/gtksourceinit.h @@ -1,7 +1,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2017 - Sébastien Wilmet + * Copyright 2017 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceiter.c b/gtksourceview/gtksourceiter.c index 538f209f..a66f7698 100644 --- a/gtksourceview/gtksourceiter.c +++ b/gtksourceview/gtksourceiter.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2014, 2016 - Sébastien Wilmet + * Copyright 2014, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceiter.h b/gtksourceview/gtksourceiter.h index 75b918c7..a9fd3f34 100644 --- a/gtksourceview/gtksourceiter.h +++ b/gtksourceview/gtksourceiter.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2014, 2016 - Sébastien Wilmet + * Copyright 2014, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcelanguage-parser-2.c b/gtksourceview/gtksourcelanguage-parser-2.c index 1a0f3939..b9afd6cd 100644 --- a/gtksourceview/gtksourcelanguage-parser-2.c +++ b/gtksourceview/gtksourcelanguage-parser-2.c @@ -3,8 +3,8 @@ * Language specification parser for 2.0 version .lang files * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez - * Copyright (C) 2005, 2006 - Emanuele Aina, Marco Barisione + * Copyright 2003 - Gustavo Giráldez + * Copyright 2005, 2006 - Emanuele Aina, Marco Barisione * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcelanguage-private.h b/gtksourceview/gtksourcelanguage-private.h index e38bfda6..061fae5a 100644 --- a/gtksourceview/gtksourcelanguage-private.h +++ b/gtksourceview/gtksourcelanguage-private.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcelanguage.c b/gtksourceview/gtksourcelanguage.c index 43105459..325a44d7 100644 --- a/gtksourceview/gtksourcelanguage.c +++ b/gtksourceview/gtksourcelanguage.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h index 59d6f425..78515245 100644 --- a/gtksourceview/gtksourcelanguage.h +++ b/gtksourceview/gtksourcelanguage.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c index eeba8a71..bc829ab7 100644 --- a/gtksourceview/gtksourcelanguagemanager.c +++ b/gtksourceview/gtksourcelanguagemanager.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2003-2007 - Paolo Maggi + * Copyright 2003-2007 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h index a145544c..90609fe3 100644 --- a/gtksourceview/gtksourcelanguagemanager.h +++ b/gtksourceview/gtksourcelanguagemanager.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemap.c b/gtksourceview/gtksourcemap.c index 35362c39..de985c3f 100644 --- a/gtksourceview/gtksourcemap.c +++ b/gtksourceview/gtksourcemap.c @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- */ /* - * Copyright (C) 2015 Christian Hergert - * Copyright (C) 2015 Ignacio Casal Quinteiro + * Copyright 2015 Christian Hergert + * Copyright 2015 Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemap.h b/gtksourceview/gtksourcemap.h index 532b0cb8..d22d85a8 100644 --- a/gtksourceview/gtksourcemap.h +++ b/gtksourceview/gtksourcemap.h @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- */ /* - * Copyright (C) 2015 Christian Hergert - * Copyright (C) 2015 Ignacio Casal Quinteiro + * Copyright 2015 Christian Hergert + * Copyright 2015 Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemark.c b/gtksourceview/gtksourcemark.c index 447f03d1..d546401c 100644 --- a/gtksourceview/gtksourcemark.c +++ b/gtksourceview/gtksourcemark.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2007 - Johannes Schmid + * Copyright 2007 - Johannes Schmid * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h index 2b44c8c2..d3a17273 100644 --- a/gtksourceview/gtksourcemark.h +++ b/gtksourceview/gtksourcemark.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2007 - Johannes Schmid + * Copyright 2007 - Johannes Schmid * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c index 8f96d9e3..3db79896 100644 --- a/gtksourceview/gtksourcemarkattributes.c +++ b/gtksourceview/gtksourcemarkattributes.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom - * Copyright (C) 2010 - Krzesimir Nowak + * Copyright 2010 - Jesse van den Kieboom + * Copyright 2010 - Krzesimir Nowak * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h index 1a9a58af..b5ca6f4d 100644 --- a/gtksourceview/gtksourcemarkattributes.h +++ b/gtksourceview/gtksourcemarkattributes.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom - * Copyright (C) 2010 - Krzesimir Nowak + * Copyright 2010 - Jesse van den Kieboom + * Copyright 2010 - Krzesimir Nowak * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemarkssequence.c b/gtksourceview/gtksourcemarkssequence.c index 9678efdc..37bc2cd0 100644 --- a/gtksourceview/gtksourcemarkssequence.c +++ b/gtksourceview/gtksourcemarkssequence.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcemarkssequence.h b/gtksourceview/gtksourcemarkssequence.h index 0c498ff1..32da1f3c 100644 --- a/gtksourceview/gtksourcemarkssequence.h +++ b/gtksourceview/gtksourcemarkssequence.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcepixbufhelper.c b/gtksourceview/gtksourcepixbufhelper.c index 59ad24df..e6e40ca5 100644 --- a/gtksourceview/gtksourcepixbufhelper.c +++ b/gtksourceview/gtksourcepixbufhelper.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcepixbufhelper.h b/gtksourceview/gtksourcepixbufhelper.h index aea01860..0010703a 100644 --- a/gtksourceview/gtksourcepixbufhelper.h +++ b/gtksourceview/gtksourcepixbufhelper.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2010 - Jesse van den Kieboom + * Copyright 2010 - Jesse van den Kieboom * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtksourceprintcompositor.c index c2ec3f60..2e5144d3 100644 --- a/gtksourceview/gtksourceprintcompositor.c +++ b/gtksourceview/gtksourceprintcompositor.c @@ -2,11 +2,11 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2000, 2001 Chema Celorio - * Copyright (C) 2003 Gustavo Giráldez - * Copyright (C) 2004 Red Hat, Inc. - * Copyright (C) 2001-2007 Paolo Maggi - * Copyright (C) 2008 Paolo Maggi, Paolo Borelli and Yevgen Muntyan + * Copyright 2000, 2001 Chema Celorio + * Copyright 2003 Gustavo Giráldez + * Copyright 2004 Red Hat, Inc. + * Copyright 2001-2007 Paolo Maggi + * Copyright 2008 Paolo Maggi, Paolo Borelli and Yevgen Muntyan * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h index f070eb51..f42074e9 100644 --- a/gtksourceview/gtksourceprintcompositor.h +++ b/gtksourceview/gtksourceprintcompositor.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 Gustavo Giráldez - * Copyright (C) 2007-2008 Paolo Maggi, Paolo Borelli and Yevgen Muntyan + * Copyright 2003 Gustavo Giráldez + * Copyright 2007-2008 Paolo Maggi, Paolo Borelli and Yevgen Muntyan * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceregex.c b/gtksourceview/gtksourceregex.c index 77570837..a6fad363 100644 --- a/gtksourceview/gtksourceregex.c +++ b/gtksourceview/gtksourceregex.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez - * Copyright (C) 2005, 2006 - Marco Barisione, Emanuele Aina + * Copyright 2003 - Gustavo Giráldez + * Copyright 2005, 2006 - Marco Barisione, Emanuele Aina * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceregex.h b/gtksourceview/gtksourceregex.h index 22fbf1c0..28ec3803 100644 --- a/gtksourceview/gtksourceregex.h +++ b/gtksourceview/gtksourceregex.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Gustavo Giráldez - * Copyright (C) 2005, 2006 - Marco Barisione, Emanuele Aina + * Copyright 2003 - Gustavo Giráldez + * Copyright 2005, 2006 - Marco Barisione, Emanuele Aina * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceregion.c b/gtksourceview/gtksourceregion.c index c8b58244..3a10505c 100644 --- a/gtksourceview/gtksourceregion.c +++ b/gtksourceview/gtksourceregion.c @@ -2,8 +2,8 @@ * gtksourceregion.c - GtkTextMark-based region utility * This file is part of GtkSourceView * - * Copyright (C) 2002 Gustavo Giráldez - * Copyright (C) 2016 Sébastien Wilmet + * Copyright 2002 Gustavo Giráldez + * Copyright 2016 Sébastien Wilmet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceregion.h b/gtksourceview/gtksourceregion.h index db1d00bd..879a1b19 100644 --- a/gtksourceview/gtksourceregion.h +++ b/gtksourceview/gtksourceregion.h @@ -2,8 +2,8 @@ * gtksourceregion.h - GtkTextMark-based region utility * This file is part of GtkSourceView * - * Copyright (C) 2002 Gustavo Giráldez - * Copyright (C) 2016 Sébastien Wilmet + * Copyright 2002 Gustavo Giráldez + * Copyright 2016 Sébastien Wilmet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c index 90811670..89093cc4 100644 --- a/gtksourceview/gtksourcesearchcontext.c +++ b/gtksourceview/gtksourcesearchcontext.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013-2016 - Sébastien Wilmet + * Copyright 2013-2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtksourcesearchcontext.h index 86797b5e..b0749f42 100644 --- a/gtksourceview/gtksourcesearchcontext.h +++ b/gtksourceview/gtksourcesearchcontext.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2013, 2016 - Sébastien Wilmet + * Copyright 2013, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcesearchsettings.c b/gtksourceview/gtksourcesearchsettings.c index 07699f58..2abe6003 100644 --- a/gtksourceview/gtksourcesearchsettings.c +++ b/gtksourceview/gtksourcesearchsettings.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcesearchsettings.h b/gtksourceview/gtksourcesearchsettings.h index a20571d2..5d1e23ac 100644 --- a/gtksourceview/gtksourcesearchsettings.h +++ b/gtksourceview/gtksourcesearchsettings.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcespacedrawer-private.h b/gtksourceview/gtksourcespacedrawer-private.h index 6480d757..49605c99 100644 --- a/gtksourceview/gtksourcespacedrawer-private.h +++ b/gtksourceview/gtksourcespacedrawer-private.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2016 - Sébastien Wilmet + * Copyright 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcespacedrawer.c b/gtksourceview/gtksourcespacedrawer.c index 40754f43..5064fbaf 100644 --- a/gtksourceview/gtksourcespacedrawer.c +++ b/gtksourceview/gtksourcespacedrawer.c @@ -2,12 +2,12 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2008, 2011, 2016 - Paolo Borelli - * Copyright (C) 2008, 2010 - Ignacio Casal Quinteiro - * Copyright (C) 2010 - Garret Regier - * Copyright (C) 2013 - Arpad Borsos - * Copyright (C) 2015, 2016 - Sébastien Wilmet - * Copyright (C) 2016 - Christian Hergert + * Copyright 2008, 2011, 2016 - Paolo Borelli + * Copyright 2008, 2010 - Ignacio Casal Quinteiro + * Copyright 2010 - Garret Regier + * Copyright 2013 - Arpad Borsos + * Copyright 2015, 2016 - Sébastien Wilmet + * Copyright 2016 - Christian Hergert * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcespacedrawer.h b/gtksourceview/gtksourcespacedrawer.h index 94095e3b..3ffb9fb8 100644 --- a/gtksourceview/gtksourcespacedrawer.h +++ b/gtksourceview/gtksourcespacedrawer.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2016 - Sébastien Wilmet + * Copyright 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyle-private.h b/gtksourceview/gtksourcestyle-private.h index 41f37dcc..b0a68e0f 100644 --- a/gtksourceview/gtksourcestyle-private.h +++ b/gtksourceview/gtksourcestyle-private.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyle.c b/gtksourceview/gtksourcestyle.c index 70fe8445..fe1e4962 100644 --- a/gtksourceview/gtksourcestyle.c +++ b/gtksourceview/gtksourcestyle.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtksourcestyle.h index ed816091..c81aa3d1 100644 --- a/gtksourceview/gtksourcestyle.h +++ b/gtksourceview/gtksourcestyle.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c index 1bd014c1..86d97315 100644 --- a/gtksourceview/gtksourcestylescheme.c +++ b/gtksourceview/gtksourcestylescheme.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h index 44623eb3..adc28f8c 100644 --- a/gtksourceview/gtksourcestylescheme.h +++ b/gtksourceview/gtksourcestylescheme.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003 - Paolo Maggi + * Copyright 2003 - Paolo Maggi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschemechooser.c b/gtksourceview/gtksourcestyleschemechooser.c index ce85d6c9..8dea7355 100644 --- a/gtksourceview/gtksourcestyleschemechooser.c +++ b/gtksourceview/gtksourcestyleschemechooser.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2014 - Ignacio Casal Quinteiro + * Copyright 2014 - Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h index 255db641..33870c1f 100644 --- a/gtksourceview/gtksourcestyleschemechooser.h +++ b/gtksourceview/gtksourcestyleschemechooser.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2014 - Ignacio Casal Quinteiro + * Copyright 2014 - Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.c b/gtksourceview/gtksourcestyleschemechooserbutton.c index 009cea36..8fad2d97 100644 --- a/gtksourceview/gtksourcestyleschemechooserbutton.c +++ b/gtksourceview/gtksourcestyleschemechooserbutton.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2014 - Christian Hergert - * Copyright (C) 2014 - Ignacio Casal Quinteiro + * Copyright 2014 - Christian Hergert + * Copyright 2014 - Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h b/gtksourceview/gtksourcestyleschemechooserbutton.h index 4d58edd8..5b53dafb 100644 --- a/gtksourceview/gtksourcestyleschemechooserbutton.h +++ b/gtksourceview/gtksourcestyleschemechooserbutton.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2014 - Christian Hergert - * Copyright (C) 2014 - Ignacio Casal Quinteiro + * Copyright 2014 - Christian Hergert + * Copyright 2014 - Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.c b/gtksourceview/gtksourcestyleschemechooserwidget.c index f3e13c66..319e74e1 100644 --- a/gtksourceview/gtksourcestyleschemechooserwidget.c +++ b/gtksourceview/gtksourcestyleschemechooserwidget.c @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2014 - Christian Hergert - * Copyright (C) 2014 - Ignacio Casal Quinteiro + * Copyright 2014 - Christian Hergert + * Copyright 2014 - Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.h b/gtksourceview/gtksourcestyleschemechooserwidget.h index 67e5e95d..77a5e7b0 100644 --- a/gtksourceview/gtksourcestyleschemechooserwidget.h +++ b/gtksourceview/gtksourcestyleschemechooserwidget.h @@ -2,8 +2,8 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2014 - Christian Hergert - * Copyright (C) 2014 - Ignacio Casal Quinteiro + * Copyright 2014 - Christian Hergert + * Copyright 2014 - Ignacio Casal Quinteiro * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c index bea622f1..020fdb9a 100644 --- a/gtksourceview/gtksourcestyleschememanager.c +++ b/gtksourceview/gtksourcestyleschememanager.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2003-2007 - Paolo Maggi + * Copyright 2003-2007 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h index e97077d0..3a13a9c4 100644 --- a/gtksourceview/gtksourcestyleschememanager.h +++ b/gtksourceview/gtksourcestyleschememanager.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2003-2007 - Paolo Maggi + * Copyright 2003-2007 - Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcetag.c b/gtksourceview/gtksourcetag.c index 22e6ddee..2970e5ae 100644 --- a/gtksourceview/gtksourcetag.c +++ b/gtksourceview/gtksourcetag.c @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2015 - Université Catholique de Louvain + * Copyright 2015 - Université Catholique de Louvain * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcetag.h b/gtksourceview/gtksourcetag.h index 2164eb1f..5b2b3be1 100644 --- a/gtksourceview/gtksourcetag.h +++ b/gtksourceview/gtksourcetag.h @@ -2,7 +2,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2015 - Université Catholique de Louvain + * Copyright 2015 - Université Catholique de Louvain * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h index 74a21847..2b947c69 100644 --- a/gtksourceview/gtksourcetypes-private.h +++ b/gtksourceview/gtksourcetypes-private.h @@ -1,7 +1,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2012, 2013, 2016 - Sébastien Wilmet + * Copyright 2012, 2013, 2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h index b0bd0d38..7a24a537 100644 --- a/gtksourceview/gtksourcetypes.h +++ b/gtksourceview/gtksourcetypes.h @@ -1,7 +1,7 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2012-2016 - Sébastien Wilmet + * Copyright 2012-2016 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceundomanager.c b/gtksourceview/gtksourceundomanager.c index de00b97b..6b8893f2 100644 --- a/gtksourceview/gtksourceundomanager.c +++ b/gtksourceview/gtksourceundomanager.c @@ -2,9 +2,9 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence - * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi - * Copyright (C) 2002-2005 Paolo Maggi + * Copyright 1998, 1999 Alex Roberts, Evan Lawrence + * Copyright 2000, 2001 Chema Celorio, Paolo Maggi + * Copyright 2002-2005 Paolo Maggi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtksourceundomanager.h index 90d978de..0fb7de78 100644 --- a/gtksourceview/gtksourceundomanager.h +++ b/gtksourceview/gtksourceundomanager.h @@ -2,9 +2,9 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence - * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi - * Copyright (C) 2002, 2003 Paolo Maggi + * Copyright 1998, 1999 Alex Roberts, Evan Lawrence + * Copyright 2000, 2001 Chema Celorio, Paolo Maggi + * Copyright 2002, 2003 Paolo Maggi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceundomanagerdefault.c b/gtksourceview/gtksourceundomanagerdefault.c index d7e33d44..9f14d1f4 100644 --- a/gtksourceview/gtksourceundomanagerdefault.c +++ b/gtksourceview/gtksourceundomanagerdefault.c @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 1998, 1999 - Alex Roberts, Evan Lawrence - * Copyright (C) 2000, 2001 - Chema Celorio, Paolo Maggi - * Copyright (C) 2002-2005 - Paolo Maggi - * Copyright (C) 2014, 2015 - Sébastien Wilmet + * Copyright 1998, 1999 - Alex Roberts, Evan Lawrence + * Copyright 2000, 2001 - Chema Celorio, Paolo Maggi + * Copyright 2002-2005 - Paolo Maggi + * Copyright 2014, 2015 - Sébastien Wilmet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtksourceundomanagerdefault.h index 1897c33b..9237fd39 100644 --- a/gtksourceview/gtksourceundomanagerdefault.h +++ b/gtksourceview/gtksourceundomanagerdefault.h @@ -2,9 +2,9 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence - * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi - * Copyright (C) 2002, 2003 Paolo Maggi + * Copyright 1998, 1999 Alex Roberts, Evan Lawrence + * Copyright 2000, 2001 Chema Celorio, Paolo Maggi + * Copyright 2002, 2003 Paolo Maggi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceutils-private.h b/gtksourceview/gtksourceutils-private.h index bd8688a3..28c08a34 100644 --- a/gtksourceview/gtksourceutils-private.h +++ b/gtksourceview/gtksourceutils-private.h @@ -2,9 +2,9 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2007 - Gustavo Giráldez - * Copyright (C) 2007 - Paolo Maggi - * Copyright (C) 2017 - Sébastien Wilmet + * Copyright 2007 - Gustavo Giráldez + * Copyright 2007 - Paolo Maggi + * Copyright 2017 - Sébastien Wilmet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceutils.c b/gtksourceview/gtksourceutils.c index 9095aae5..7aa79d2f 100644 --- a/gtksourceview/gtksourceutils.c +++ b/gtksourceview/gtksourceutils.c @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2005 - Paolo Borelli - * Copyright (C) 2007 - Gustavo Giráldez - * Copyright (C) 2007 - Paolo Maggi - * Copyright (C) 2013, 2017 - Sébastien Wilmet + * Copyright 2005 - Paolo Borelli + * Copyright 2007 - Gustavo Giráldez + * Copyright 2007 - Paolo Maggi + * Copyright 2013, 2017 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceutils.h b/gtksourceview/gtksourceutils.h index 97fe6d8e..bd3b2f3d 100644 --- a/gtksourceview/gtksourceutils.h +++ b/gtksourceview/gtksourceutils.h @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2013 - Sébastien Wilmet + * Copyright 2013 - Sébastien Wilmet * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceversion.c b/gtksourceview/gtksourceversion.c index 2533f729..6aea3c8f 100644 --- a/gtksourceview/gtksourceversion.c +++ b/gtksourceview/gtksourceversion.c @@ -2,7 +2,7 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2015 - Paolo Borelli + * Copyright 2015 - Paolo Borelli * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c index e10584aa..78f87c67 100644 --- a/gtksourceview/gtksourceview.c +++ b/gtksourceview/gtksourceview.c @@ -2,10 +2,10 @@ /* * This file is part of GtkSourceView * - * Copyright (C) 2001 - Mikael Hermansson and - * Chris Phelps - * Copyright (C) 2002 - Jeroen Zwartepoorte - * Copyright (C) 2003 - Gustavo Giráldez and Paolo Maggi + * Copyright 2001 Mikael Hermansson and + * Chris Phelps + * Copyright 2002 Jeroen Zwartepoorte + * Copyright 2003 Gustavo Giráldez and Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h index b7c08f45..81fc7c4f 100644 --- a/gtksourceview/gtksourceview.h +++ b/gtksourceview/gtksourceview.h @@ -2,9 +2,9 @@ * * This file is part of GtkSourceView * - * Copyright (C) 2001 - Mikael Hermansson and - * Chris Phelps - * Copyright (C) 2003 - Gustavo Giráldez and Paolo Maggi + * Copyright 2001 Mikael Hermansson and + * Chris Phelps + * Copyright 2003 Gustavo Giráldez and Paolo Maggi * * GtkSourceView is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- GitLab From 6dd2c8d39221b909b01f0a4edb9e2fe5979dc19a Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 16:09:20 -0800 Subject: [PATCH 006/248] build: remove use of HAVE_CONFIG_H This is unnecessary because we always HAVE_CONFIG_H --- .../completion-providers/words/gtksourcecompletionwords.c | 4 +--- .../words/gtksourcecompletionwordsbuffer.c | 4 +--- .../words/gtksourcecompletionwordslibrary.c | 4 +--- .../words/gtksourcecompletionwordsproposal.c | 4 +--- .../words/gtksourcecompletionwordsutils.c | 4 +--- gtksourceview/gtksourcebuffer.c | 4 +--- gtksourceview/gtksourcebufferinputstream.c | 4 +--- gtksourceview/gtksourcebufferinternal.c | 4 +--- gtksourceview/gtksourcebufferoutputstream.c | 4 +--- gtksourceview/gtksourcecompletion.c | 4 +--- gtksourceview/gtksourcecompletioncontainer.c | 4 +--- gtksourceview/gtksourcecompletioncontext.c | 4 +--- gtksourceview/gtksourcecompletioninfo.c | 4 +--- gtksourceview/gtksourcecompletionitem.c | 4 +--- gtksourceview/gtksourcecompletionmodel.c | 4 +--- gtksourceview/gtksourcecompletionproposal.c | 4 +--- gtksourceview/gtksourcecompletionprovider.c | 4 +--- gtksourceview/gtksourcecontextengine.c | 4 +--- gtksourceview/gtksourceencoding.c | 4 +--- gtksourceview/gtksourceengine.c | 4 +--- gtksourceview/gtksourcefile.c | 4 +--- gtksourceview/gtksourcefileloader.c | 4 +--- gtksourceview/gtksourcefilesaver.c | 4 +--- gtksourceview/gtksourcegutter.c | 4 +--- gtksourceview/gtksourcegutterrenderer.c | 4 +--- gtksourceview/gtksourcegutterrendererlines.c | 4 +--- gtksourceview/gtksourcegutterrenderermarks.c | 4 +--- gtksourceview/gtksourcegutterrendererpixbuf.c | 4 +--- gtksourceview/gtksourcegutterrenderertext.c | 4 +--- gtksourceview/gtksourceinit.c | 4 +--- gtksourceview/gtksourceiter.c | 4 +--- gtksourceview/gtksourcelanguage-parser-2.c | 4 +--- gtksourceview/gtksourcelanguage.c | 4 +--- gtksourceview/gtksourcelanguagemanager.c | 4 +--- gtksourceview/gtksourcemap.c | 4 +--- gtksourceview/gtksourcemark.c | 4 +--- gtksourceview/gtksourcemarkattributes.c | 4 +--- gtksourceview/gtksourcemarkssequence.c | 4 +--- gtksourceview/gtksourcepixbufhelper.c | 4 +--- gtksourceview/gtksourceprintcompositor.c | 4 +--- gtksourceview/gtksourceregex.c | 4 +--- gtksourceview/gtksourceregion.c | 4 +--- gtksourceview/gtksourcesearchcontext.c | 4 +--- gtksourceview/gtksourcesearchsettings.c | 4 +--- gtksourceview/gtksourcespacedrawer.c | 4 +--- gtksourceview/gtksourcestyle.c | 4 +--- gtksourceview/gtksourcestylescheme.c | 4 +--- gtksourceview/gtksourcestyleschemechooser.c | 4 +--- gtksourceview/gtksourcestyleschemechooserbutton.c | 4 +--- gtksourceview/gtksourcestyleschemechooserwidget.c | 4 +--- gtksourceview/gtksourcestyleschememanager.c | 4 +--- gtksourceview/gtksourcetag.c | 4 +--- gtksourceview/gtksourceundomanager.c | 4 +--- gtksourceview/gtksourceundomanagerdefault.c | 4 +--- gtksourceview/gtksourceutils.c | 4 +--- gtksourceview/gtksourceversion.c | 4 +--- gtksourceview/gtksourceview.c | 4 +--- 57 files changed, 57 insertions(+), 171 deletions(-) diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c index a6a2e53b..548d1726 100644 --- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c +++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c @@ -29,9 +29,7 @@ * appearing in the registered #GtkTextBuffers. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionwords.h" #include diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c index 693daa2c..a03e03a9 100644 --- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c +++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionwordsbuffer.h" #include "gtksourcecompletionwordsutils.h" diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c index 0c494051..3f39f8ac 100644 --- a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c +++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionwordslibrary.h" diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c index fbcc5d29..f69ab060 100644 --- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c +++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionwordsproposal.h" diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c index c0a317ac..c76d5583 100644 --- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c +++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionwordsutils.h" #include diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c index 8e7d507c..bad12f1d 100644 --- a/gtksourceview/gtksourcebuffer.c +++ b/gtksourceview/gtksourcebuffer.c @@ -22,9 +22,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcebuffer.h" #include "gtksourcebuffer-private.h" diff --git a/gtksourceview/gtksourcebufferinputstream.c b/gtksourceview/gtksourcebufferinputstream.c index 764ef378..ec984607 100644 --- a/gtksourceview/gtksourcebufferinputstream.c +++ b/gtksourceview/gtksourcebufferinputstream.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/gtksourceview/gtksourcebufferinternal.c b/gtksourceview/gtksourcebufferinternal.c index ca6632d8..08b82642 100644 --- a/gtksourceview/gtksourcebufferinternal.c +++ b/gtksourceview/gtksourcebufferinternal.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcebufferinternal.h" #include "gtksourcebuffer.h" diff --git a/gtksourceview/gtksourcebufferoutputstream.c b/gtksourceview/gtksourcebufferoutputstream.c index 250ace20..32981ff9 100644 --- a/gtksourceview/gtksourcebufferoutputstream.c +++ b/gtksourceview/gtksourcebufferoutputstream.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcebufferoutputstream.h" #include diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c index 63eb6be6..36043b8c 100644 --- a/gtksourceview/gtksourcecompletion.c +++ b/gtksourceview/gtksourcecompletion.c @@ -97,9 +97,7 @@ * GtkSourceCompletionInfo for the main completion window. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletion.h" #include "gtksourcecompletion-private.h" diff --git a/gtksourceview/gtksourcecompletioncontainer.c b/gtksourceview/gtksourcecompletioncontainer.c index e28434b1..8b76bffb 100644 --- a/gtksourceview/gtksourcecompletioncontainer.c +++ b/gtksourceview/gtksourcecompletioncontainer.c @@ -29,9 +29,7 @@ * limit. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletioncontainer.h" diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c index f78c6007..f3616c4f 100644 --- a/gtksourceview/gtksourcecompletioncontext.c +++ b/gtksourceview/gtksourcecompletioncontext.c @@ -59,9 +59,7 @@ * #GtkTextBuffer with gtk_text_iter_get_buffer(). */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletioncontext.h" #include "gtksource-enumtypes.h" diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c index 362c8465..77f6582f 100644 --- a/gtksourceview/gtksourcecompletioninfo.c +++ b/gtksourceview/gtksourcecompletioninfo.c @@ -55,9 +55,7 @@ * #GtkSourceCompletion machinery, you don't need to worry about this. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletioninfo.h" #include diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c index b07b5c7c..0b4054d6 100644 --- a/gtksourceview/gtksourcecompletionitem.c +++ b/gtksourceview/gtksourcecompletionitem.c @@ -28,9 +28,7 @@ * #GtkSourceCompletionProposal interface. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionitem.h" #include "gtksourcecompletionproposal.h" diff --git a/gtksourceview/gtksourcecompletionmodel.c b/gtksourceview/gtksourcecompletionmodel.c index 5588f59a..4fb66cb0 100644 --- a/gtksourceview/gtksourcecompletionmodel.c +++ b/gtksourceview/gtksourcecompletionmodel.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionmodel.h" #include diff --git a/gtksourceview/gtksourcecompletionproposal.c b/gtksourceview/gtksourcecompletionproposal.c index faa2dfdd..6bd71bfd 100644 --- a/gtksourceview/gtksourcecompletionproposal.c +++ b/gtksourceview/gtksourcecompletionproposal.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionproposal.h" diff --git a/gtksourceview/gtksourcecompletionprovider.c b/gtksourceview/gtksourcecompletionprovider.c index c31ec248..9a3302cc 100644 --- a/gtksourceview/gtksourcecompletionprovider.c +++ b/gtksourceview/gtksourcecompletionprovider.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecompletionprovider.h" #include "gtksourcecompletionproposal.h" diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c index c31218e8..f7355ea6 100644 --- a/gtksourceview/gtksourcecontextengine.c +++ b/gtksourceview/gtksourcecontextengine.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcecontextengine.h" #include diff --git a/gtksourceview/gtksourceencoding.c b/gtksourceview/gtksourceencoding.c index 9c0ece9d..6e73f408 100644 --- a/gtksourceview/gtksourceencoding.c +++ b/gtksourceview/gtksourceencoding.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceencoding.h" #include "gtksourceencoding-private.h" diff --git a/gtksourceview/gtksourceengine.c b/gtksourceview/gtksourceengine.c index 77600d5d..eb5832e9 100644 --- a/gtksourceview/gtksourceengine.c +++ b/gtksourceview/gtksourceengine.c @@ -20,9 +20,7 @@ /* Interface for syntax highlighting engines. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceengine.h" #include "gtksourcestylescheme.h" diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c index 1e58422e..717f7138 100644 --- a/gtksourceview/gtksourcefile.c +++ b/gtksourceview/gtksourcefile.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcefile.h" #include "gtksourceencoding.h" diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c index b9b58450..54e446be 100644 --- a/gtksourceview/gtksourcefileloader.c +++ b/gtksourceview/gtksourcefileloader.c @@ -21,9 +21,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcefileloader.h" #include diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c index dad85ae3..9c29aaec 100644 --- a/gtksourceview/gtksourcefilesaver.c +++ b/gtksourceview/gtksourcefilesaver.c @@ -21,9 +21,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcefilesaver.h" #include diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c index 015bb361..dcf88fee 100644 --- a/gtksourceview/gtksourcegutter.c +++ b/gtksourceview/gtksourcegutter.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcegutter.h" #include "gtksourcegutter-private.h" diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c index 9d31465c..8ea50bc7 100644 --- a/gtksourceview/gtksourcegutterrenderer.c +++ b/gtksourceview/gtksourcegutterrenderer.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcegutterrenderer.h" #include "gtksourcegutterrenderer-private.h" diff --git a/gtksourceview/gtksourcegutterrendererlines.c b/gtksourceview/gtksourcegutterrendererlines.c index 2d63d0df..e2f23b0a 100644 --- a/gtksourceview/gtksourcegutterrendererlines.c +++ b/gtksourceview/gtksourcegutterrendererlines.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcegutterrendererlines.h" #include "gtksourceutils-private.h" diff --git a/gtksourceview/gtksourcegutterrenderermarks.c b/gtksourceview/gtksourcegutterrenderermarks.c index b85e65d5..af7da0e3 100644 --- a/gtksourceview/gtksourcegutterrenderermarks.c +++ b/gtksourceview/gtksourcegutterrenderermarks.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcegutterrenderermarks.h" #include "gtksourceview.h" diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c index f7924111..8fcbbc55 100644 --- a/gtksourceview/gtksourcegutterrendererpixbuf.c +++ b/gtksourceview/gtksourcegutterrendererpixbuf.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcegutterrendererpixbuf.h" #include "gtksourcepixbufhelper.h" diff --git a/gtksourceview/gtksourcegutterrenderertext.c b/gtksourceview/gtksourcegutterrenderertext.c index 4246ee9b..2c413289 100644 --- a/gtksourceview/gtksourcegutterrenderertext.c +++ b/gtksourceview/gtksourcegutterrenderertext.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcegutterrenderertext.h" diff --git a/gtksourceview/gtksourceinit.c b/gtksourceview/gtksourceinit.c index 0dda887f..64d98909 100644 --- a/gtksourceview/gtksourceinit.c +++ b/gtksourceview/gtksourceinit.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceview-gresources.h" diff --git a/gtksourceview/gtksourceiter.c b/gtksourceview/gtksourceiter.c index a66f7698..33c21f84 100644 --- a/gtksourceview/gtksourceiter.c +++ b/gtksourceview/gtksourceiter.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceiter.h" diff --git a/gtksourceview/gtksourcelanguage-parser-2.c b/gtksourceview/gtksourcelanguage-parser-2.c index b9afd6cd..1ef2a09c 100644 --- a/gtksourceview/gtksourcelanguage-parser-2.c +++ b/gtksourceview/gtksourcelanguage-parser-2.c @@ -28,9 +28,7 @@ #define DEBUG(x) #endif -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcebuffer.h" #include "gtksourcelanguage.h" diff --git a/gtksourceview/gtksourcelanguage.c b/gtksourceview/gtksourcelanguage.c index 325a44d7..0391c9fd 100644 --- a/gtksourceview/gtksourcelanguage.c +++ b/gtksourceview/gtksourcelanguage.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c index bc829ab7..bdee87c6 100644 --- a/gtksourceview/gtksourcelanguagemanager.c +++ b/gtksourceview/gtksourcelanguagemanager.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcelanguagemanager.h" diff --git a/gtksourceview/gtksourcemap.c b/gtksourceview/gtksourcemap.c index de985c3f..792776e0 100644 --- a/gtksourceview/gtksourcemap.c +++ b/gtksourceview/gtksourcemap.c @@ -17,9 +17,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcemap.h" #include diff --git a/gtksourceview/gtksourcemark.c b/gtksourceview/gtksourcemark.c index d546401c..a3b3b8e4 100644 --- a/gtksourceview/gtksourcemark.c +++ b/gtksourceview/gtksourcemark.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcemark.h" #include "gtksourcebuffer.h" diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c index 3db79896..57a1c03b 100644 --- a/gtksourceview/gtksourcemarkattributes.c +++ b/gtksourceview/gtksourcemarkattributes.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcemarkattributes.h" #include "gtksourcemark.h" diff --git a/gtksourceview/gtksourcemarkssequence.c b/gtksourceview/gtksourcemarkssequence.c index 37bc2cd0..35a55662 100644 --- a/gtksourceview/gtksourcemarkssequence.c +++ b/gtksourceview/gtksourcemarkssequence.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcemarkssequence.h" diff --git a/gtksourceview/gtksourcepixbufhelper.c b/gtksourceview/gtksourcepixbufhelper.c index e6e40ca5..a52d9f53 100644 --- a/gtksourceview/gtksourcepixbufhelper.c +++ b/gtksourceview/gtksourcepixbufhelper.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcepixbufhelper.h" diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtksourceprintcompositor.c index 2e5144d3..f152cfba 100644 --- a/gtksourceview/gtksourceprintcompositor.c +++ b/gtksourceview/gtksourceprintcompositor.c @@ -22,9 +22,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/gtksourceview/gtksourceregex.c b/gtksourceview/gtksourceregex.c index a6fad363..7420437e 100644 --- a/gtksourceview/gtksourceregex.c +++ b/gtksourceview/gtksourceregex.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceregex.h" #include diff --git a/gtksourceview/gtksourceregion.c b/gtksourceview/gtksourceregion.c index 3a10505c..c2ee094c 100644 --- a/gtksourceview/gtksourceregion.c +++ b/gtksourceview/gtksourceregion.c @@ -19,9 +19,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceregion.h" diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c index 89093cc4..ae90ec19 100644 --- a/gtksourceview/gtksourcesearchcontext.c +++ b/gtksourceview/gtksourcesearchcontext.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcesearchcontext.h" #include diff --git a/gtksourceview/gtksourcesearchsettings.c b/gtksourceview/gtksourcesearchsettings.c index 2abe6003..3834965b 100644 --- a/gtksourceview/gtksourcesearchsettings.c +++ b/gtksourceview/gtksourcesearchsettings.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcesearchsettings.h" diff --git a/gtksourceview/gtksourcespacedrawer.c b/gtksourceview/gtksourcespacedrawer.c index 5064fbaf..98ff77bf 100644 --- a/gtksourceview/gtksourcespacedrawer.c +++ b/gtksourceview/gtksourcespacedrawer.c @@ -23,9 +23,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcespacedrawer.h" #include "gtksourcespacedrawer-private.h" diff --git a/gtksourceview/gtksourcestyle.c b/gtksourceview/gtksourcestyle.c index fe1e4962..e35dbca7 100644 --- a/gtksourceview/gtksourcestyle.c +++ b/gtksourceview/gtksourcestyle.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcestyle.h" #include "gtksourcestyle-private.h" diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c index 86d97315..e37c625d 100644 --- a/gtksourceview/gtksourcestylescheme.c +++ b/gtksourceview/gtksourcestylescheme.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcestylescheme.h" #include diff --git a/gtksourceview/gtksourcestyleschemechooser.c b/gtksourceview/gtksourcestyleschemechooser.c index 8dea7355..56de962d 100644 --- a/gtksourceview/gtksourcestyleschemechooser.c +++ b/gtksourceview/gtksourcestyleschemechooser.c @@ -18,9 +18,7 @@ * along with GtkSourceView. If not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcestyleschemechooser.h" #include "gtksourcestylescheme.h" diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.c b/gtksourceview/gtksourcestyleschemechooserbutton.c index 8fad2d97..77d5d1b3 100644 --- a/gtksourceview/gtksourcestyleschemechooserbutton.c +++ b/gtksourceview/gtksourcestyleschemechooserbutton.c @@ -19,9 +19,7 @@ * along with GtkSourceView. If not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcestyleschemechooserbutton.h" #include diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.c b/gtksourceview/gtksourcestyleschemechooserwidget.c index 319e74e1..91025a35 100644 --- a/gtksourceview/gtksourcestyleschemechooserwidget.c +++ b/gtksourceview/gtksourcestyleschemechooserwidget.c @@ -19,9 +19,7 @@ * along with GtkSourceView. If not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcestyleschemechooserwidget.h" #include "gtksourcestyleschemechooser.h" diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c index 020fdb9a..9a50c6b7 100644 --- a/gtksourceview/gtksourcestyleschememanager.c +++ b/gtksourceview/gtksourcestyleschememanager.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcestyleschememanager.h" #include diff --git a/gtksourceview/gtksourcetag.c b/gtksourceview/gtksourcetag.c index 2970e5ae..38aa4c03 100644 --- a/gtksourceview/gtksourcetag.c +++ b/gtksourceview/gtksourcetag.c @@ -20,9 +20,7 @@ * Author: Sébastien Wilmet */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourcetag.h" diff --git a/gtksourceview/gtksourceundomanager.c b/gtksourceview/gtksourceundomanager.c index 6b8893f2..010aeab4 100644 --- a/gtksourceview/gtksourceundomanager.c +++ b/gtksourceview/gtksourceundomanager.c @@ -20,9 +20,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/gtksourceview/gtksourceundomanagerdefault.c b/gtksourceview/gtksourceundomanagerdefault.c index 9f14d1f4..a19bb96a 100644 --- a/gtksourceview/gtksourceundomanagerdefault.c +++ b/gtksourceview/gtksourceundomanagerdefault.c @@ -21,9 +21,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceundomanagerdefault.h" #include diff --git a/gtksourceview/gtksourceutils.c b/gtksourceview/gtksourceutils.c index 7aa79d2f..9024c667 100644 --- a/gtksourceview/gtksourceutils.c +++ b/gtksourceview/gtksourceutils.c @@ -29,9 +29,7 @@ * Utility functions. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceutils.h" #include "gtksourceutils-private.h" diff --git a/gtksourceview/gtksourceversion.c b/gtksourceview/gtksourceversion.c index 6aea3c8f..f6927492 100644 --- a/gtksourceview/gtksourceversion.c +++ b/gtksourceview/gtksourceversion.c @@ -18,9 +18,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceversion.h" diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c index 78f87c67..734797ca 100644 --- a/gtksourceview/gtksourceview.c +++ b/gtksourceview/gtksourceview.c @@ -21,9 +21,7 @@ * along with this library; if not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include "gtksourceview.h" -- GitLab From 68d6846c9c0bd52c05c793d6b068c9fff9159a1c Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 16:30:11 -0800 Subject: [PATCH 007/248] buffer: modernize GtkSourceBuffer - Use G_DECLARE* - Align similar functions - Use get_instance_private() - Remove autocleanup helpers --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcebuffer-private.h | 74 ++--- gtksourceview/gtksourcebuffer.c | 394 ++++++++++++++---------- gtksourceview/gtksourcebuffer.h | 217 +++++-------- 4 files changed, 346 insertions(+), 340 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 550fa1c4..eb1b2293 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceBuffer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletion, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionInfo, g_object_unref) diff --git a/gtksourceview/gtksourcebuffer-private.h b/gtksourceview/gtksourcebuffer-private.h index 2b86e14d..492c33c8 100644 --- a/gtksourceview/gtksourcebuffer-private.h +++ b/gtksourceview/gtksourcebuffer-private.h @@ -29,62 +29,48 @@ G_BEGIN_DECLS GTK_SOURCE_INTERNAL -void _gtk_source_buffer_update_syntax_highlight (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end, - gboolean synchronous); - +void _gtk_source_buffer_update_syntax_highlight (GtkSourceBuffer *buffer, + const GtkTextIter *start, + const GtkTextIter *end, + gboolean synchronous); GTK_SOURCE_INTERNAL -void _gtk_source_buffer_update_search_highlight (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end, - gboolean synchronous); - +void _gtk_source_buffer_update_search_highlight (GtkSourceBuffer *buffer, + const GtkTextIter *start, + const GtkTextIter *end, + gboolean synchronous); GTK_SOURCE_INTERNAL -GtkSourceMark *_gtk_source_buffer_source_mark_next (GtkSourceBuffer *buffer, - GtkSourceMark *mark, - const gchar *category); - +GtkSourceMark *_gtk_source_buffer_source_mark_next (GtkSourceBuffer *buffer, + GtkSourceMark *mark, + const gchar *category); GTK_SOURCE_INTERNAL -GtkSourceMark *_gtk_source_buffer_source_mark_prev (GtkSourceBuffer *buffer, - GtkSourceMark *mark, - const gchar *category); - +GtkSourceMark *_gtk_source_buffer_source_mark_prev (GtkSourceBuffer *buffer, + GtkSourceMark *mark, + const gchar *category); GTK_SOURCE_INTERNAL -GtkTextTag *_gtk_source_buffer_get_bracket_match_tag (GtkSourceBuffer *buffer); - +GtkTextTag *_gtk_source_buffer_get_bracket_match_tag (GtkSourceBuffer *buffer); GTK_SOURCE_INTERNAL -void _gtk_source_buffer_add_search_context (GtkSourceBuffer *buffer, - GtkSourceSearchContext *search_context); - +void _gtk_source_buffer_add_search_context (GtkSourceBuffer *buffer, + GtkSourceSearchContext *search_context); GTK_SOURCE_INTERNAL -void _gtk_source_buffer_set_as_invalid_character (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end); - +void _gtk_source_buffer_set_as_invalid_character (GtkSourceBuffer *buffer, + const GtkTextIter *start, + const GtkTextIter *end); GTK_SOURCE_INTERNAL -gboolean _gtk_source_buffer_has_invalid_chars (GtkSourceBuffer *buffer); - +gboolean _gtk_source_buffer_has_invalid_chars (GtkSourceBuffer *buffer); GTK_SOURCE_INTERNAL -GtkSourceBracketMatchType - _gtk_source_buffer_find_bracket_match (GtkSourceBuffer *buffer, - const GtkTextIter *pos, - GtkTextIter *bracket, - GtkTextIter *bracket_match); - +GtkSourceBracketMatchType _gtk_source_buffer_find_bracket_match (GtkSourceBuffer *buffer, + const GtkTextIter *pos, + GtkTextIter *bracket, + GtkTextIter *bracket_match); GTK_SOURCE_INTERNAL -void _gtk_source_buffer_save_and_clear_selection (GtkSourceBuffer *buffer); - +void _gtk_source_buffer_save_and_clear_selection (GtkSourceBuffer *buffer); GTK_SOURCE_INTERNAL -void _gtk_source_buffer_restore_selection (GtkSourceBuffer *buffer); - +void _gtk_source_buffer_restore_selection (GtkSourceBuffer *buffer); GTK_SOURCE_INTERNAL -gboolean _gtk_source_buffer_is_undo_redo_enabled (GtkSourceBuffer *buffer); - +gboolean _gtk_source_buffer_is_undo_redo_enabled (GtkSourceBuffer *buffer); GTK_SOURCE_INTERNAL -gboolean _gtk_source_buffer_has_source_marks (GtkSourceBuffer *buffer); - +gboolean _gtk_source_buffer_has_source_marks (GtkSourceBuffer *buffer); GTK_SOURCE_INTERNAL -gboolean _gtk_source_buffer_has_spaces_tag (GtkSourceBuffer *buffer); +gboolean _gtk_source_buffer_has_spaces_tag (GtkSourceBuffer *buffer); G_END_DECLS diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c index bad12f1d..76c5ef05 100644 --- a/gtksourceview/gtksourcebuffer.c +++ b/gtksourceview/gtksourcebuffer.c @@ -190,7 +190,7 @@ enum N_PROPERTIES }; -struct _GtkSourceBufferPrivate +typedef struct { GtkTextTag *bracket_match_tag; GtkSourceBracketMatchType bracket_match_state; @@ -218,7 +218,7 @@ struct _GtkSourceBufferPrivate guint highlight_syntax : 1; guint highlight_brackets : 1; guint implicit_trailing_newline : 1; -}; +} GtkSourceBufferPrivate; static guint buffer_signals[N_SIGNALS]; static GParamSpec *buffer_properties[N_PROPERTIES]; @@ -272,7 +272,9 @@ static void gtk_source_buffer_check_tag_for_spaces (GtkSourceBuffer *buffer, GtkSourceTag *tag) { - if (!buffer->priv->has_draw_spaces_tag) + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + if (!priv->has_draw_spaces_tag) { gboolean draw_spaces_set; @@ -282,7 +284,7 @@ gtk_source_buffer_check_tag_for_spaces (GtkSourceBuffer *buffer, if (draw_spaces_set) { - buffer->priv->has_draw_spaces_tag = TRUE; + priv->has_draw_spaces_tag = TRUE; } } } @@ -314,9 +316,10 @@ static void gtk_source_buffer_constructed (GObject *object) { GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (object); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GtkTextTagTable *table; - if (buffer->priv->undo_manager == NULL) + if (priv->undo_manager == NULL) { /* This will install the default undo manager */ gtk_source_buffer_set_undo_manager (buffer, NULL); @@ -587,35 +590,37 @@ static void set_undo_manager (GtkSourceBuffer *buffer, GtkSourceUndoManager *manager) { - if (manager == buffer->priv->undo_manager) + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + if (manager == priv->undo_manager) { return; } - if (buffer->priv->undo_manager != NULL) + if (priv->undo_manager != NULL) { - g_signal_handlers_disconnect_by_func (buffer->priv->undo_manager, + g_signal_handlers_disconnect_by_func (priv->undo_manager, G_CALLBACK (gtk_source_buffer_can_undo_handler), buffer); - g_signal_handlers_disconnect_by_func (buffer->priv->undo_manager, + g_signal_handlers_disconnect_by_func (priv->undo_manager, G_CALLBACK (gtk_source_buffer_can_redo_handler), buffer); - g_object_unref (buffer->priv->undo_manager); - buffer->priv->undo_manager = NULL; + g_object_unref (priv->undo_manager); + priv->undo_manager = NULL; } if (manager != NULL) { - buffer->priv->undo_manager = g_object_ref (manager); + priv->undo_manager = g_object_ref (manager); - g_signal_connect (buffer->priv->undo_manager, + g_signal_connect (priv->undo_manager, "can-undo-changed", G_CALLBACK (gtk_source_buffer_can_undo_handler), buffer); - g_signal_connect (buffer->priv->undo_manager, + g_signal_connect (priv->undo_manager, "can-redo-changed", G_CALLBACK (gtk_source_buffer_can_redo_handler), buffer); @@ -630,8 +635,9 @@ static void search_context_weak_notify_cb (GtkSourceBuffer *buffer, GObject *search_context) { - buffer->priv->search_contexts = g_list_remove (buffer->priv->search_contexts, - search_context); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + priv->search_contexts = g_list_remove (priv->search_contexts, search_context); } static void @@ -639,8 +645,6 @@ gtk_source_buffer_init (GtkSourceBuffer *buffer) { GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); - buffer->priv = priv; - priv->highlight_syntax = TRUE; priv->highlight_brackets = TRUE; priv->bracket_match_state = GTK_SOURCE_BRACKET_MATCH_NONE; @@ -665,29 +669,30 @@ static void gtk_source_buffer_dispose (GObject *object) { GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (object); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GList *l; - if (buffer->priv->bracket_highlighting_timeout_id != 0) + if (priv->bracket_highlighting_timeout_id != 0) { - g_source_remove (buffer->priv->bracket_highlighting_timeout_id); - buffer->priv->bracket_highlighting_timeout_id = 0; + g_source_remove (priv->bracket_highlighting_timeout_id); + priv->bracket_highlighting_timeout_id = 0; } - if (buffer->priv->undo_manager != NULL) + if (priv->undo_manager != NULL) { set_undo_manager (buffer, NULL); } - if (buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { - _gtk_source_engine_attach_buffer (buffer->priv->highlight_engine, NULL); + _gtk_source_engine_attach_buffer (priv->highlight_engine, NULL); } - g_clear_object (&buffer->priv->highlight_engine); - g_clear_object (&buffer->priv->language); - g_clear_object (&buffer->priv->style_scheme); + g_clear_object (&priv->highlight_engine); + g_clear_object (&priv->language); + g_clear_object (&priv->style_scheme); - for (l = buffer->priv->search_contexts; l != NULL; l = l->next) + for (l = priv->search_contexts; l != NULL; l = l->next) { GtkSourceSearchContext *search_context = l->data; @@ -696,15 +701,15 @@ gtk_source_buffer_dispose (GObject *object) buffer); } - g_list_free (buffer->priv->search_contexts); - buffer->priv->search_contexts = NULL; + g_list_free (priv->search_contexts); + priv->search_contexts = NULL; - g_clear_object (&buffer->priv->all_source_marks); + g_clear_object (&priv->all_source_marks); - if (buffer->priv->source_marks != NULL) + if (priv->source_marks != NULL) { - g_hash_table_unref (buffer->priv->source_marks); - buffer->priv->source_marks = NULL; + g_hash_table_unref (priv->source_marks); + priv->source_marks = NULL; } G_OBJECT_CLASS (gtk_source_buffer_parent_class)->dispose (object); @@ -716,11 +721,7 @@ gtk_source_buffer_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GtkSourceBuffer *buffer; - - g_return_if_fail (GTK_SOURCE_IS_BUFFER (object)); - - buffer = GTK_SOURCE_BUFFER (object); + GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (object); switch (prop_id) { @@ -764,32 +765,29 @@ gtk_source_buffer_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GtkSourceBuffer *buffer; - - g_return_if_fail (GTK_SOURCE_IS_BUFFER (object)); - - buffer = GTK_SOURCE_BUFFER (object); + GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (object); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); switch (prop_id) { case PROP_HIGHLIGHT_SYNTAX: - g_value_set_boolean (value, buffer->priv->highlight_syntax); + g_value_set_boolean (value, priv->highlight_syntax); break; case PROP_HIGHLIGHT_MATCHING_BRACKETS: - g_value_set_boolean (value, buffer->priv->highlight_brackets); + g_value_set_boolean (value, priv->highlight_brackets); break; case PROP_MAX_UNDO_LEVELS: - g_value_set_int (value, buffer->priv->max_undo_levels); + g_value_set_int (value, priv->max_undo_levels); break; case PROP_LANGUAGE: - g_value_set_object (value, buffer->priv->language); + g_value_set_object (value, priv->language); break; case PROP_STYLE_SCHEME: - g_value_set_object (value, buffer->priv->style_scheme); + g_value_set_object (value, priv->style_scheme); break; case PROP_CAN_UNDO: @@ -801,11 +799,11 @@ gtk_source_buffer_get_property (GObject *object, break; case PROP_UNDO_MANAGER: - g_value_set_object (value, buffer->priv->undo_manager); + g_value_set_object (value, priv->undo_manager); break; case PROP_IMPLICIT_TRAILING_NEWLINE: - g_value_set_boolean (value, buffer->priv->implicit_trailing_newline); + g_value_set_boolean (value, priv->implicit_trailing_newline); break; default: @@ -825,6 +823,8 @@ gtk_source_buffer_get_property (GObject *object, GtkSourceBuffer * gtk_source_buffer_new (GtkTextTagTable *table) { + g_return_val_if_fail (table == NULL || GTK_IS_TEXT_TAG_TABLE (table), NULL); + return g_object_new (GTK_SOURCE_TYPE_BUFFER, "tag-table", table, NULL); @@ -873,34 +873,37 @@ gtk_source_buffer_can_redo_handler (GtkSourceUndoManager *manager, static void update_bracket_match_style (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GtkSourceStyle *style = NULL; - if (buffer->priv->bracket_match_tag == NULL) + if (priv->bracket_match_tag == NULL) { return; } - if (buffer->priv->style_scheme != NULL) + if (priv->style_scheme != NULL) { - style = _gtk_source_style_scheme_get_matching_brackets_style (buffer->priv->style_scheme); + style = _gtk_source_style_scheme_get_matching_brackets_style (priv->style_scheme); } - gtk_source_style_apply (style, buffer->priv->bracket_match_tag); + gtk_source_style_apply (style, priv->bracket_match_tag); } static GtkTextTag * get_bracket_match_tag (GtkSourceBuffer *buffer) { - if (buffer->priv->bracket_match_tag == NULL) + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + if (priv->bracket_match_tag == NULL) { - buffer->priv->bracket_match_tag = + priv->bracket_match_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer), NULL, NULL); update_bracket_match_style (buffer); } - return buffer->priv->bracket_match_tag; + return priv->bracket_match_tag; } /* This is private, just used by the print compositor to not print bracket @@ -910,7 +913,9 @@ get_bracket_match_tag (GtkSourceBuffer *buffer) GtkTextTag * _gtk_source_buffer_get_bracket_match_tag (GtkSourceBuffer *buffer) { - return buffer->priv->bracket_match_tag; + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + return priv->bracket_match_tag; } static gunichar @@ -1057,15 +1062,14 @@ remove_tag_with_minimal_damage (GtkTextBuffer *buffer, static void update_bracket_highlighting (GtkSourceBuffer *source_buffer) { - GtkTextBuffer *buffer; + GtkTextBuffer *buffer = GTK_TEXT_BUFFER (source_buffer); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (source_buffer); GtkTextIter insert_iter; GtkTextIter bracket; GtkTextIter bracket_match; GtkSourceBracketMatchType previous_state; - buffer = GTK_TEXT_BUFFER (source_buffer); - - if (source_buffer->priv->bracket_match_tag != NULL) + if (priv->bracket_match_tag != NULL) { GtkTextIter start; GtkTextIter end; @@ -1073,20 +1077,20 @@ update_bracket_highlighting (GtkSourceBuffer *source_buffer) gtk_text_buffer_get_bounds (buffer, &start, &end); remove_tag_with_minimal_damage (GTK_TEXT_BUFFER (source_buffer), - source_buffer->priv->bracket_match_tag, + priv->bracket_match_tag, &start, &end); } - if (!source_buffer->priv->highlight_brackets) + if (!priv->highlight_brackets) { - if (source_buffer->priv->bracket_match_tag != NULL) + if (priv->bracket_match_tag != NULL) { GtkTextTagTable *table; table = gtk_text_buffer_get_tag_table (buffer); - gtk_text_tag_table_remove (table, source_buffer->priv->bracket_match_tag); - source_buffer->priv->bracket_match_tag = NULL; + gtk_text_tag_table_remove (table, priv->bracket_match_tag); + priv->bracket_match_tag = NULL; } return; @@ -1096,14 +1100,14 @@ update_bracket_highlighting (GtkSourceBuffer *source_buffer) &insert_iter, gtk_text_buffer_get_insert (buffer)); - previous_state = source_buffer->priv->bracket_match_state; - source_buffer->priv->bracket_match_state = + previous_state = priv->bracket_match_state; + priv->bracket_match_state = _gtk_source_buffer_find_bracket_match (source_buffer, &insert_iter, &bracket, &bracket_match); - if (source_buffer->priv->bracket_match_state == GTK_SOURCE_BRACKET_MATCH_FOUND) + if (priv->bracket_match_state == GTK_SOURCE_BRACKET_MATCH_FOUND) { GtkTextIter next_iter; @@ -1133,13 +1137,13 @@ update_bracket_highlighting (GtkSourceBuffer *source_buffer) * positions are nonbrackets. */ if (previous_state != GTK_SOURCE_BRACKET_MATCH_NONE || - source_buffer->priv->bracket_match_state != GTK_SOURCE_BRACKET_MATCH_NONE) + priv->bracket_match_state != GTK_SOURCE_BRACKET_MATCH_NONE) { g_signal_emit (source_buffer, buffer_signals[BRACKET_MATCHED], 0, NULL, - source_buffer->priv->bracket_match_state); + priv->bracket_match_state); } } @@ -1147,19 +1151,22 @@ static gboolean bracket_highlighting_timeout_cb (gpointer user_data) { GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (user_data); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); update_bracket_highlighting (buffer); - buffer->priv->bracket_highlighting_timeout_id = 0; + priv->bracket_highlighting_timeout_id = 0; return G_SOURCE_REMOVE; } static void queue_bracket_highlighting_update (GtkSourceBuffer *buffer) { - if (buffer->priv->bracket_highlighting_timeout_id != 0) + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + if (priv->bracket_highlighting_timeout_id != 0) { - g_source_remove (buffer->priv->bracket_highlighting_timeout_id); + g_source_remove (priv->bracket_highlighting_timeout_id); } /* Queue an update to the bracket location instead of doing it @@ -1179,7 +1186,7 @@ queue_bracket_highlighting_update (GtkSourceBuffer *buffer) * If we had access to a GdkFrameClock, we might consider using * ::update() or ::after-paint() to synchronize this. */ - buffer->priv->bracket_highlighting_timeout_id = + priv->bracket_highlighting_timeout_id = gdk_threads_add_timeout_full (G_PRIORITY_LOW, UPDATE_BRACKET_DELAY, bracket_highlighting_timeout_cb, @@ -1211,12 +1218,13 @@ gtk_source_buffer_content_inserted (GtkTextBuffer *buffer, gint end_offset) { GtkSourceBuffer *source_buffer = GTK_SOURCE_BUFFER (buffer); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (source_buffer); cursor_moved (source_buffer); - if (source_buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { - _gtk_source_engine_text_inserted (source_buffer->priv->highlight_engine, + _gtk_source_engine_text_inserted (priv->highlight_engine, start_offset, end_offset); } @@ -1309,6 +1317,7 @@ gtk_source_buffer_real_delete_range (GtkTextBuffer *buffer, { gint offset, length; GtkSourceBuffer *source_buffer = GTK_SOURCE_BUFFER (buffer); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (source_buffer); g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); g_return_if_fail (start != NULL); @@ -1325,9 +1334,9 @@ gtk_source_buffer_real_delete_range (GtkTextBuffer *buffer, cursor_moved (source_buffer); /* emit text deleted for engines */ - if (source_buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { - _gtk_source_engine_text_deleted (source_buffer->priv->highlight_engine, + _gtk_source_engine_text_deleted (priv->highlight_engine, offset, length); } } @@ -1534,9 +1543,11 @@ _gtk_source_buffer_find_bracket_match (GtkSourceBuffer *buffer, gboolean gtk_source_buffer_can_undo (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - return gtk_source_undo_manager_can_undo (buffer->priv->undo_manager); + return gtk_source_undo_manager_can_undo (priv->undo_manager); } /** @@ -1551,9 +1562,11 @@ gtk_source_buffer_can_undo (GtkSourceBuffer *buffer) gboolean gtk_source_buffer_can_redo (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - return gtk_source_undo_manager_can_redo (buffer->priv->undo_manager); + return gtk_source_undo_manager_can_redo (priv->undo_manager); } /** @@ -1602,9 +1615,11 @@ gtk_source_buffer_redo (GtkSourceBuffer *buffer) gint gtk_source_buffer_get_max_undo_levels (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), 0); - return buffer->priv->max_undo_levels; + return priv->max_undo_levels; } /** @@ -1624,18 +1639,20 @@ void gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer, gint max_undo_levels) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); - if (buffer->priv->max_undo_levels == max_undo_levels) + if (priv->max_undo_levels == max_undo_levels) { return; } - buffer->priv->max_undo_levels = max_undo_levels; + priv->max_undo_levels = max_undo_levels; - if (GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (buffer->priv->undo_manager)) + if (GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (priv->undo_manager)) { - gtk_source_undo_manager_default_set_max_undo_levels (GTK_SOURCE_UNDO_MANAGER_DEFAULT (buffer->priv->undo_manager), + gtk_source_undo_manager_default_set_max_undo_levels (GTK_SOURCE_UNDO_MANAGER_DEFAULT (priv->undo_manager), max_undo_levels); } @@ -1645,20 +1662,22 @@ gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer, gboolean _gtk_source_buffer_is_undo_redo_enabled (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - if (buffer->priv->undo_manager == NULL) + if (priv->undo_manager == NULL) { return FALSE; } /* A custom UndoManager is not forced to follow max_undo_levels. */ - if (!GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (buffer->priv->undo_manager)) + if (!GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (priv->undo_manager)) { return TRUE; } - return buffer->priv->max_undo_levels != 0; + return priv->max_undo_levels != 0; } /** @@ -1676,9 +1695,11 @@ _gtk_source_buffer_is_undo_redo_enabled (GtkSourceBuffer *buffer) void gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); - gtk_source_undo_manager_begin_not_undoable_action (buffer->priv->undo_manager); + gtk_source_undo_manager_begin_not_undoable_action (priv->undo_manager); } /** @@ -1693,9 +1714,11 @@ gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer) void gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); - gtk_source_undo_manager_end_not_undoable_action (buffer->priv->undo_manager); + gtk_source_undo_manager_end_not_undoable_action (priv->undo_manager); } /** @@ -1711,9 +1734,11 @@ gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer) gboolean gtk_source_buffer_get_highlight_matching_brackets (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - return buffer->priv->highlight_brackets; + return priv->highlight_brackets; } /** @@ -1730,13 +1755,15 @@ void gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer, gboolean highlight) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); highlight = highlight != FALSE; - if (highlight != buffer->priv->highlight_brackets) + if (highlight != priv->highlight_brackets) { - buffer->priv->highlight_brackets = highlight; + priv->highlight_brackets = highlight; update_bracket_highlighting (buffer); @@ -1756,9 +1783,11 @@ gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer, gboolean gtk_source_buffer_get_highlight_syntax (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - return buffer->priv->highlight_syntax; + return priv->highlight_syntax; } /** @@ -1780,13 +1809,15 @@ void gtk_source_buffer_set_highlight_syntax (GtkSourceBuffer *buffer, gboolean highlight) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); highlight = highlight != FALSE; - if (buffer->priv->highlight_syntax != highlight) + if (priv->highlight_syntax != highlight) { - buffer->priv->highlight_syntax = highlight; + priv->highlight_syntax = highlight; g_object_notify_by_pspec (G_OBJECT (buffer), buffer_properties[PROP_HIGHLIGHT_SYNTAX]); } } @@ -1808,36 +1839,38 @@ void gtk_source_buffer_set_language (GtkSourceBuffer *buffer, GtkSourceLanguage *language) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); g_return_if_fail (GTK_SOURCE_IS_LANGUAGE (language) || language == NULL); - if (!g_set_object (&buffer->priv->language, language)) + if (!g_set_object (&priv->language, language)) { return; } - if (buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { /* disconnect the old engine */ - _gtk_source_engine_attach_buffer (buffer->priv->highlight_engine, NULL); - g_object_unref (buffer->priv->highlight_engine); - buffer->priv->highlight_engine = NULL; + _gtk_source_engine_attach_buffer (priv->highlight_engine, NULL); + g_object_unref (priv->highlight_engine); + priv->highlight_engine = NULL; } if (language != NULL) { /* get a new engine */ - buffer->priv->highlight_engine = _gtk_source_language_create_engine (language); + priv->highlight_engine = _gtk_source_language_create_engine (language); - if (buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { - _gtk_source_engine_attach_buffer (buffer->priv->highlight_engine, + _gtk_source_engine_attach_buffer (priv->highlight_engine, GTK_TEXT_BUFFER (buffer)); - if (buffer->priv->style_scheme != NULL) + if (priv->style_scheme != NULL) { - _gtk_source_engine_set_style_scheme (buffer->priv->highlight_engine, - buffer->priv->style_scheme); + _gtk_source_engine_set_style_scheme (priv->highlight_engine, + priv->style_scheme); } } } @@ -1859,9 +1892,11 @@ gtk_source_buffer_set_language (GtkSourceBuffer *buffer, GtkSourceLanguage * gtk_source_buffer_get_language (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); - return buffer->priv->language; + return priv->language; } /* @@ -1879,11 +1914,13 @@ _gtk_source_buffer_update_syntax_highlight (GtkSourceBuffer *buffer, const GtkTextIter *end, gboolean synchronous) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); - if (buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { - _gtk_source_engine_update_highlight (buffer->priv->highlight_engine, + _gtk_source_engine_update_highlight (priv->highlight_engine, start, end, synchronous); @@ -1896,11 +1933,12 @@ _gtk_source_buffer_update_search_highlight (GtkSourceBuffer *buffer, const GtkTextIter *end, gboolean synchronous) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GList *l; g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); - for (l = buffer->priv->search_contexts; l != NULL; l = l->next) + for (l = priv->search_contexts; l != NULL; l = l->next) { GtkSourceSearchContext *search_context = l->data; @@ -1959,16 +1997,18 @@ void gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer, GtkSourceStyleScheme *scheme) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme) || scheme == NULL); - if (g_set_object (&buffer->priv->style_scheme, scheme)) + if (g_set_object (&priv->style_scheme, scheme)) { update_bracket_match_style (buffer); - if (buffer->priv->highlight_engine != NULL) + if (priv->highlight_engine != NULL) { - _gtk_source_engine_set_style_scheme (buffer->priv->highlight_engine, scheme); + _gtk_source_engine_set_style_scheme (priv->highlight_engine, scheme); } g_object_notify_by_pspec (G_OBJECT (buffer), buffer_properties[PROP_STYLE_SCHEME]); @@ -1989,29 +2029,33 @@ gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer, GtkSourceStyleScheme * gtk_source_buffer_get_style_scheme (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); - return buffer->priv->style_scheme; + return priv->style_scheme; } static void add_source_mark (GtkSourceBuffer *buffer, GtkSourceMark *mark) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + const gchar *category; GtkSourceMarksSequence *seq; - _gtk_source_marks_sequence_add (buffer->priv->all_source_marks, + _gtk_source_marks_sequence_add (priv->all_source_marks, GTK_TEXT_MARK (mark)); category = gtk_source_mark_get_category (mark); - seq = g_hash_table_lookup (buffer->priv->source_marks, category); + seq = g_hash_table_lookup (priv->source_marks, category); if (seq == NULL) { seq = _gtk_source_marks_sequence_new (GTK_TEXT_BUFFER (buffer)); - g_hash_table_insert (buffer->priv->source_marks, + g_hash_table_insert (priv->source_marks, g_strdup (category), seq); } @@ -2046,15 +2090,16 @@ gtk_source_buffer_real_mark_deleted (GtkTextBuffer *buffer, if (GTK_SOURCE_IS_MARK (mark)) { GtkSourceBuffer *source_buffer = GTK_SOURCE_BUFFER (buffer); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (source_buffer); const gchar *category; GtkSourceMarksSequence *seq; category = gtk_source_mark_get_category (GTK_SOURCE_MARK (mark)); - seq = g_hash_table_lookup (source_buffer->priv->source_marks, category); + seq = g_hash_table_lookup (priv->source_marks, category); if (_gtk_source_marks_sequence_is_empty (seq)) { - g_hash_table_remove (source_buffer->priv->source_marks, category); + g_hash_table_remove (priv->source_marks, category); } g_signal_emit (buffer, buffer_signals[SOURCE_MARK_UPDATED], 0, mark); @@ -2069,17 +2114,21 @@ gtk_source_buffer_real_mark_deleted (GtkTextBuffer *buffer, static void gtk_source_buffer_real_undo (GtkSourceBuffer *buffer) { - g_return_if_fail (gtk_source_undo_manager_can_undo (buffer->priv->undo_manager)); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); - gtk_source_undo_manager_undo (buffer->priv->undo_manager); + g_return_if_fail (gtk_source_undo_manager_can_undo (priv->undo_manager)); + + gtk_source_undo_manager_undo (priv->undo_manager); } static void gtk_source_buffer_real_redo (GtkSourceBuffer *buffer) { - g_return_if_fail (gtk_source_undo_manager_can_redo (buffer->priv->undo_manager)); + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + g_return_if_fail (gtk_source_undo_manager_can_redo (priv->undo_manager)); - gtk_source_undo_manager_redo (buffer->priv->undo_manager); + gtk_source_undo_manager_redo (priv->undo_manager); } /** @@ -2137,9 +2186,11 @@ static GtkSourceMarksSequence * get_marks_sequence (GtkSourceBuffer *buffer, const gchar *category) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + return category == NULL ? - buffer->priv->all_source_marks : - g_hash_table_lookup (buffer->priv->source_marks, category); + priv->all_source_marks : + g_hash_table_lookup (priv->source_marks, category); } GtkSourceMark * @@ -2380,11 +2431,13 @@ gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer, gboolean _gtk_source_buffer_has_source_marks (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - if (buffer->priv->all_source_marks != NULL) + if (priv->all_source_marks != NULL) { - return !_gtk_source_marks_sequence_is_empty (buffer->priv->all_source_marks); + return !_gtk_source_marks_sequence_is_empty (priv->all_source_marks); } return FALSE; @@ -2582,6 +2635,7 @@ gtk_source_buffer_iter_backward_to_context_class_toggle (GtkSourceBuffer *buffer void _gtk_source_buffer_save_and_clear_selection (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GtkTextBuffer *buf; g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); @@ -2597,13 +2651,13 @@ _gtk_source_buffer_save_and_clear_selection (GtkSourceBuffer *buffer) GtkTextIter insert_iter; GtkTextIter selection_bound_iter; - g_assert (buffer->priv->tmp_insert_mark == NULL); - g_assert (buffer->priv->tmp_selection_bound_mark == NULL); + g_assert (priv->tmp_insert_mark == NULL); + g_assert (priv->tmp_selection_bound_mark == NULL); gtk_text_buffer_get_iter_at_mark (buf, &insert_iter, gtk_text_buffer_get_insert (buf)); gtk_text_buffer_get_iter_at_mark (buf, &selection_bound_iter, gtk_text_buffer_get_selection_bound (buf)); - buffer->priv->tmp_insert_mark = gtk_text_buffer_create_mark (buf, NULL, &insert_iter, FALSE); - buffer->priv->tmp_selection_bound_mark = gtk_text_buffer_create_mark (buf, NULL, &selection_bound_iter, FALSE); + priv->tmp_insert_mark = gtk_text_buffer_create_mark (buf, NULL, &insert_iter, FALSE); + priv->tmp_selection_bound_mark = gtk_text_buffer_create_mark (buf, NULL, &selection_bound_iter, FALSE); gtk_text_buffer_place_cursor (buf, &insert_iter); } @@ -2612,10 +2666,12 @@ _gtk_source_buffer_save_and_clear_selection (GtkSourceBuffer *buffer) void _gtk_source_buffer_restore_selection (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); - if (buffer->priv->tmp_insert_mark != NULL && - buffer->priv->tmp_selection_bound_mark != NULL) + if (priv->tmp_insert_mark != NULL && + priv->tmp_selection_bound_mark != NULL) { GtkTextBuffer *buf; GtkTextIter insert_iter; @@ -2623,15 +2679,15 @@ _gtk_source_buffer_restore_selection (GtkSourceBuffer *buffer) buf = GTK_TEXT_BUFFER (buffer); - gtk_text_buffer_get_iter_at_mark (buf, &insert_iter, buffer->priv->tmp_insert_mark); - gtk_text_buffer_get_iter_at_mark (buf, &selection_bound_iter, buffer->priv->tmp_selection_bound_mark); + gtk_text_buffer_get_iter_at_mark (buf, &insert_iter, priv->tmp_insert_mark); + gtk_text_buffer_get_iter_at_mark (buf, &selection_bound_iter, priv->tmp_selection_bound_mark); gtk_text_buffer_select_range (buf, &insert_iter, &selection_bound_iter); - gtk_text_buffer_delete_mark (buf, buffer->priv->tmp_insert_mark); - gtk_text_buffer_delete_mark (buf, buffer->priv->tmp_selection_bound_mark); - buffer->priv->tmp_insert_mark = NULL; - buffer->priv->tmp_selection_bound_mark = NULL; + gtk_text_buffer_delete_mark (buf, priv->tmp_insert_mark); + gtk_text_buffer_delete_mark (buf, priv->tmp_selection_bound_mark); + priv->tmp_insert_mark = NULL; + priv->tmp_selection_bound_mark = NULL; } } @@ -3148,6 +3204,8 @@ void gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer, GtkSourceUndoManager *manager) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); g_return_if_fail (manager == NULL || GTK_SOURCE_IS_UNDO_MANAGER (manager)); @@ -3155,7 +3213,7 @@ gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer, { manager = g_object_new (GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT, "buffer", buffer, - "max-undo-levels", buffer->priv->max_undo_levels, + "max-undo-levels", priv->max_undo_levels, NULL); } else @@ -3183,25 +3241,29 @@ gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer, GtkSourceUndoManager * gtk_source_buffer_get_undo_manager (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); - return buffer->priv->undo_manager; + return priv->undo_manager; } void _gtk_source_buffer_add_search_context (GtkSourceBuffer *buffer, GtkSourceSearchContext *search_context) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); g_return_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search_context)); g_return_if_fail (gtk_source_search_context_get_buffer (search_context) == buffer); - if (g_list_find (buffer->priv->search_contexts, search_context) != NULL) + if (g_list_find (priv->search_contexts, search_context) != NULL) { return; } - buffer->priv->search_contexts = g_list_prepend (buffer->priv->search_contexts, + priv->search_contexts = g_list_prepend (priv->search_contexts, search_context); g_object_weak_ref (G_OBJECT (search_context), @@ -3214,14 +3276,15 @@ sync_invalid_char_tag (GtkSourceBuffer *buffer, GParamSpec *pspec, gpointer data) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GtkSourceStyle *style = NULL; - if (buffer->priv->style_scheme != NULL) + if (priv->style_scheme != NULL) { - style = gtk_source_style_scheme_get_style (buffer->priv->style_scheme, "def:error"); + style = gtk_source_style_scheme_get_style (priv->style_scheme, "def:error"); } - gtk_source_style_apply (style, buffer->priv->invalid_char_tag); + gtk_source_style_apply (style, priv->invalid_char_tag); } static void @@ -3241,9 +3304,11 @@ _gtk_source_buffer_set_as_invalid_character (GtkSourceBuffer *buffer, const GtkTextIter *start, const GtkTextIter *end) { - if (buffer->priv->invalid_char_tag == NULL) + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + + if (priv->invalid_char_tag == NULL) { - buffer->priv->invalid_char_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer), + priv->invalid_char_tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer), "invalid-char-style", NULL); @@ -3258,11 +3323,11 @@ _gtk_source_buffer_set_as_invalid_character (GtkSourceBuffer *buffer, /* Make sure the 'error' tag has the priority over * syntax highlighting tags. */ - text_tag_set_highest_priority (buffer->priv->invalid_char_tag, + text_tag_set_highest_priority (priv->invalid_char_tag, GTK_TEXT_BUFFER (buffer)); gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), - buffer->priv->invalid_char_tag, + priv->invalid_char_tag, start, end); } @@ -3270,19 +3335,20 @@ _gtk_source_buffer_set_as_invalid_character (GtkSourceBuffer *buffer, gboolean _gtk_source_buffer_has_invalid_chars (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); GtkTextIter start; g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - if (buffer->priv->invalid_char_tag == NULL) + if (priv->invalid_char_tag == NULL) { return FALSE; } gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start); - if (gtk_text_iter_starts_tag (&start, buffer->priv->invalid_char_tag) || - gtk_text_iter_forward_to_tag_toggle (&start, buffer->priv->invalid_char_tag)) + if (gtk_text_iter_starts_tag (&start, priv->invalid_char_tag) || + gtk_text_iter_forward_to_tag_toggle (&start, priv->invalid_char_tag)) { return TRUE; } @@ -3317,13 +3383,15 @@ void gtk_source_buffer_set_implicit_trailing_newline (GtkSourceBuffer *buffer, gboolean implicit_trailing_newline) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer)); implicit_trailing_newline = implicit_trailing_newline != FALSE; - if (buffer->priv->implicit_trailing_newline != implicit_trailing_newline) + if (priv->implicit_trailing_newline != implicit_trailing_newline) { - buffer->priv->implicit_trailing_newline = implicit_trailing_newline; + priv->implicit_trailing_newline = implicit_trailing_newline; g_object_notify_by_pspec (G_OBJECT (buffer), buffer_properties[PROP_IMPLICIT_TRAILING_NEWLINE]); } } @@ -3338,9 +3406,11 @@ gtk_source_buffer_set_implicit_trailing_newline (GtkSourceBuffer *buffer, gboolean gtk_source_buffer_get_implicit_trailing_newline (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), TRUE); - return buffer->priv->implicit_trailing_newline; + return priv->implicit_trailing_newline; } /** @@ -3405,7 +3475,9 @@ gtk_source_buffer_create_source_tag (GtkSourceBuffer *buffer, gboolean _gtk_source_buffer_has_spaces_tag (GtkSourceBuffer *buffer) { + GtkSourceBufferPrivate *priv = gtk_source_buffer_get_instance_private (buffer); + g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE); - return buffer->priv->has_draw_spaces_tag; + return priv->has_draw_spaces_tag; } diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h index 40307380..c6dda139 100644 --- a/gtksourceview/gtksourcebuffer.h +++ b/gtksourceview/gtksourcebuffer.h @@ -33,15 +33,10 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_BUFFER (gtk_source_buffer_get_type ()) -#define GTK_SOURCE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_BUFFER, GtkSourceBuffer)) -#define GTK_SOURCE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_BUFFER, GtkSourceBufferClass)) -#define GTK_SOURCE_IS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_BUFFER)) -#define GTK_SOURCE_IS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_BUFFER)) -#define GTK_SOURCE_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_BUFFER, GtkSourceBufferClass)) +#define GTK_SOURCE_TYPE_BUFFER (gtk_source_buffer_get_type()) -typedef struct _GtkSourceBufferClass GtkSourceBufferClass; -typedef struct _GtkSourceBufferPrivate GtkSourceBufferPrivate; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourceBuffer, gtk_source_buffer, GTK_SOURCE, BUFFER, GtkTextBuffer) /** * GtkSourceBracketMatchType: @@ -93,13 +88,6 @@ typedef enum _GtkSourceSortFlags GTK_SOURCE_SORT_FLAGS_REMOVE_DUPLICATES = 1 << 2, } GtkSourceSortFlags; -struct _GtkSourceBuffer -{ - GtkTextBuffer parent_instance; - - GtkSourceBufferPrivate *priv; -}; - struct _GtkSourceBufferClass { GtkTextBufferClass parent_class; @@ -117,160 +105,121 @@ struct _GtkSourceBufferClass }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_buffer_get_type (void) G_GNUC_CONST; - +GtkSourceBuffer *gtk_source_buffer_new (GtkTextTagTable *table); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceBuffer *gtk_source_buffer_new (GtkTextTagTable *table); - +GtkSourceBuffer *gtk_source_buffer_new_with_language (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceBuffer *gtk_source_buffer_new_with_language (GtkSourceLanguage *language); - +gboolean gtk_source_buffer_get_highlight_syntax (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_get_highlight_syntax (GtkSourceBuffer *buffer); - -GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_set_highlight_syntax (GtkSourceBuffer *buffer, - gboolean highlight); - +void gtk_source_buffer_set_highlight_syntax (GtkSourceBuffer *buffer, + gboolean highlight); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_get_highlight_matching_brackets (GtkSourceBuffer *buffer); - +gboolean gtk_source_buffer_get_highlight_matching_brackets (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer, - gboolean highlight); - +void gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer, + gboolean highlight); GTK_SOURCE_AVAILABLE_IN_ALL -gint gtk_source_buffer_get_max_undo_levels (GtkSourceBuffer *buffer); - +gint gtk_source_buffer_get_max_undo_levels (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer, - gint max_undo_levels); - +void gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer, + gint max_undo_levels); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceLanguage *gtk_source_buffer_get_language (GtkSourceBuffer *buffer); - +GtkSourceLanguage *gtk_source_buffer_get_language (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_set_language (GtkSourceBuffer *buffer, - GtkSourceLanguage *language); - +void gtk_source_buffer_set_language (GtkSourceBuffer *buffer, + GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_can_undo (GtkSourceBuffer *buffer); - +gboolean gtk_source_buffer_can_undo (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_can_redo (GtkSourceBuffer *buffer); - +gboolean gtk_source_buffer_can_redo (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceStyleScheme *gtk_source_buffer_get_style_scheme (GtkSourceBuffer *buffer); - +GtkSourceStyleScheme *gtk_source_buffer_get_style_scheme (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer, - GtkSourceStyleScheme *scheme); - +void gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer, + GtkSourceStyleScheme *scheme); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_ensure_highlight (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end); - +void gtk_source_buffer_ensure_highlight (GtkSourceBuffer *buffer, + const GtkTextIter *start, + const GtkTextIter *end); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_undo (GtkSourceBuffer *buffer); - +void gtk_source_buffer_undo (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_redo (GtkSourceBuffer *buffer); - +void gtk_source_buffer_redo (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer); - +void gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer); - +void gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceMark *gtk_source_buffer_create_source_mark (GtkSourceBuffer *buffer, - const gchar *name, - const gchar *category, - const GtkTextIter *where); - +GtkSourceMark *gtk_source_buffer_create_source_mark (GtkSourceBuffer *buffer, + const gchar *name, + const gchar *category, + const GtkTextIter *where); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_forward_iter_to_source_mark (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *category); - +gboolean gtk_source_buffer_forward_iter_to_source_mark (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *category); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_backward_iter_to_source_mark (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *category); - +gboolean gtk_source_buffer_backward_iter_to_source_mark (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *category); GTK_SOURCE_AVAILABLE_IN_ALL -GSList *gtk_source_buffer_get_source_marks_at_iter (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *category); - +GSList *gtk_source_buffer_get_source_marks_at_iter (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *category); GTK_SOURCE_AVAILABLE_IN_ALL -GSList *gtk_source_buffer_get_source_marks_at_line (GtkSourceBuffer *buffer, - gint line, - const gchar *category); - +GSList *gtk_source_buffer_get_source_marks_at_line (GtkSourceBuffer *buffer, + gint line, + const gchar *category); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end, - const gchar *category); - +void gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer, + const GtkTextIter *start, + const GtkTextIter *end, + const gchar *category); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_iter_has_context_class (GtkSourceBuffer *buffer, - const GtkTextIter *iter, - const gchar *context_class); - +gboolean gtk_source_buffer_iter_has_context_class (GtkSourceBuffer *buffer, + const GtkTextIter *iter, + const gchar *context_class); GTK_SOURCE_AVAILABLE_IN_ALL -gchar **gtk_source_buffer_get_context_classes_at_iter (GtkSourceBuffer *buffer, - const GtkTextIter *iter); - +gchar **gtk_source_buffer_get_context_classes_at_iter (GtkSourceBuffer *buffer, + const GtkTextIter *iter); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_iter_forward_to_context_class_toggle (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *context_class); - +gboolean gtk_source_buffer_iter_forward_to_context_class_toggle (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *context_class); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_buffer_iter_backward_to_context_class_toggle - (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *context_class); - +gboolean gtk_source_buffer_iter_backward_to_context_class_toggle (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *context_class); GTK_SOURCE_AVAILABLE_IN_3_12 -void gtk_source_buffer_change_case (GtkSourceBuffer *buffer, - GtkSourceChangeCaseType case_type, - GtkTextIter *start, - GtkTextIter *end); - +void gtk_source_buffer_change_case (GtkSourceBuffer *buffer, + GtkSourceChangeCaseType case_type, + GtkTextIter *start, + GtkTextIter *end); GTK_SOURCE_AVAILABLE_IN_3_16 -void gtk_source_buffer_join_lines (GtkSourceBuffer *buffer, - GtkTextIter *start, - GtkTextIter *end); - +void gtk_source_buffer_join_lines (GtkSourceBuffer *buffer, + GtkTextIter *start, + GtkTextIter *end); GTK_SOURCE_AVAILABLE_IN_3_18 -void gtk_source_buffer_sort_lines (GtkSourceBuffer *buffer, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceSortFlags flags, - gint column); - +void gtk_source_buffer_sort_lines (GtkSourceBuffer *buffer, + GtkTextIter *start, + GtkTextIter *end, + GtkSourceSortFlags flags, + gint column); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceUndoManager *gtk_source_buffer_get_undo_manager (GtkSourceBuffer *buffer); - +GtkSourceUndoManager *gtk_source_buffer_get_undo_manager (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer, - GtkSourceUndoManager *manager); - +void gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer, + GtkSourceUndoManager *manager); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_buffer_set_implicit_trailing_newline (GtkSourceBuffer *buffer, - gboolean implicit_trailing_newline); - +void gtk_source_buffer_set_implicit_trailing_newline (GtkSourceBuffer *buffer, + gboolean implicit_trailing_newline); GTK_SOURCE_AVAILABLE_IN_3_14 -gboolean gtk_source_buffer_get_implicit_trailing_newline (GtkSourceBuffer *buffer); - +gboolean gtk_source_buffer_get_implicit_trailing_newline (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -GtkTextTag *gtk_source_buffer_create_source_tag (GtkSourceBuffer *buffer, - const gchar *tag_name, - const gchar *first_property_name, - ...); +GtkTextTag *gtk_source_buffer_create_source_tag (GtkSourceBuffer *buffer, + const gchar *tag_name, + const gchar *first_property_name, + ...); + G_END_DECLS -- GitLab From 3d5fa3005db4515ed1fbce2775d67a9987f2ad5d Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 16:44:18 -0800 Subject: [PATCH 008/248] completion: modernize GtkSourceCompletion Make GtkSourceCompletion final as it cannot be sub-classed to any useful effect. --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcecompletion.c | 691 +++++++++++++------------- gtksourceview/gtksourcecompletion.h | 49 +- 3 files changed, 338 insertions(+), 403 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index eb1b2293..81f05d40 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletion, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionInfo, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionItem, g_object_unref) diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c index 36043b8c..96962b13 100644 --- a/gtksourceview/gtksourcecompletion.c +++ b/gtksourceview/gtksourcecompletion.c @@ -140,8 +140,10 @@ enum PROP_PROPOSAL_PAGE_SIZE }; -struct _GtkSourceCompletionPrivate +struct _GtkSourceCompletion { + GObject parent_instance; + GtkSourceCompletionInfo *main_window; GtkSourceCompletionInfo *info_window; @@ -207,7 +209,6 @@ static guint signals[N_SIGNALS]; static void gtk_source_completion_buildable_interface_init (GtkBuildableIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkSourceCompletion, gtk_source_completion, G_TYPE_OBJECT, - G_ADD_PRIVATE (GtkSourceCompletion) G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_source_completion_buildable_interface_init)) @@ -218,16 +219,16 @@ scroll_to_iter (GtkSourceCompletion *completion, GtkTreePath *path; GtkTreeIter prev_iter = *iter; - path = gtk_tree_model_get_path (GTK_TREE_MODEL (completion->priv->model_proposals), + path = gtk_tree_model_get_path (GTK_TREE_MODEL (completion->model_proposals), iter); - gtk_tree_view_scroll_to_cell (completion->priv->tree_view_proposals, + gtk_tree_view_scroll_to_cell (completion->tree_view_proposals, path, NULL, FALSE, 0, 0); gtk_tree_path_free (path); - if (gtk_source_completion_model_iter_previous (completion->priv->model_proposals, &prev_iter) && - gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, &prev_iter)) + if (gtk_source_completion_model_iter_previous (completion->model_proposals, &prev_iter) && + gtk_source_completion_model_iter_is_header (completion->model_proposals, &prev_iter)) { /* If we want to scroll to the first proposal of a provider, * it's better to show the header too, if there is a header. @@ -235,10 +236,10 @@ scroll_to_iter (GtkSourceCompletion *completion, * header, so we are sure that the proposal is visible. */ - path = gtk_tree_model_get_path (GTK_TREE_MODEL (completion->priv->model_proposals), + path = gtk_tree_model_get_path (GTK_TREE_MODEL (completion->model_proposals), &prev_iter); - gtk_tree_view_scroll_to_cell (completion->priv->tree_view_proposals, + gtk_tree_view_scroll_to_cell (completion->tree_view_proposals, path, NULL, FALSE, 0, 0); gtk_tree_path_free (path); @@ -256,28 +257,28 @@ get_selected_proposal (GtkSourceCompletion *completion, GtkTreeIter iter; GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) { return FALSE; } - if (gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, &iter)) + if (gtk_source_completion_model_iter_is_header (completion->model_proposals, &iter)) { return FALSE; } if (provider != NULL) { - gtk_tree_model_get (GTK_TREE_MODEL (completion->priv->model_proposals), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (completion->model_proposals), &iter, GTK_SOURCE_COMPLETION_MODEL_COLUMN_PROVIDER, provider, -1); } if (proposal != NULL) { - gtk_tree_model_get (GTK_TREE_MODEL (completion->priv->model_proposals), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (completion->model_proposals), &iter, GTK_SOURCE_COMPLETION_MODEL_COLUMN_PROPOSAL, proposal, -1); } @@ -293,17 +294,17 @@ check_first_selected (GtkSourceCompletion *completion) GtkTreeIter iter; if (get_selected_proposal (completion, NULL, NULL) || - !completion->priv->select_on_show) + !completion->select_on_show) { return FALSE; } - if (!gtk_source_completion_model_first_proposal (completion->priv->model_proposals, &iter)) + if (!gtk_source_completion_model_first_proposal (completion->model_proposals, &iter)) { return FALSE; } - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); gtk_tree_selection_select_iter (selection, &iter); scroll_to_iter (completion, &iter); @@ -314,9 +315,9 @@ static void get_iter_at_insert (GtkSourceCompletion *completion, GtkTextIter *iter) { - gtk_text_buffer_get_iter_at_mark (completion->priv->buffer, + gtk_text_buffer_get_iter_at_mark (completion->buffer, iter, - gtk_text_buffer_get_insert (completion->priv->buffer)); + gtk_text_buffer_get_insert (completion->buffer)); } static GList * @@ -353,7 +354,7 @@ static gint minimum_auto_complete_delay (GtkSourceCompletion *completion, GList *providers) { - gint min_delay = completion->priv->auto_complete_delay; + gint min_delay = completion->auto_complete_delay; while (providers != NULL) { @@ -374,24 +375,24 @@ minimum_auto_complete_delay (GtkSourceCompletion *completion, static void reset_completion (GtkSourceCompletion *completion) { - if (completion->priv->show_timed_out_id != 0) + if (completion->show_timed_out_id != 0) { - g_source_remove (completion->priv->show_timed_out_id); - completion->priv->show_timed_out_id = 0; + g_source_remove (completion->show_timed_out_id); + completion->show_timed_out_id = 0; } - if (completion->priv->context != NULL) + if (completion->context != NULL) { /* Inform providers of cancellation through the context */ - _gtk_source_completion_context_cancel (completion->priv->context); + _gtk_source_completion_context_cancel (completion->context); - g_clear_object (&completion->priv->context); + g_clear_object (&completion->context); } - g_list_free (completion->priv->running_providers); - g_list_free (completion->priv->active_providers); - completion->priv->running_providers = NULL; - completion->priv->active_providers = NULL; + g_list_free (completion->running_providers); + g_list_free (completion->active_providers); + completion->running_providers = NULL; + completion->active_providers = NULL; } /* A separator is a character like (, a space etc. An _ is not a separator. */ @@ -462,7 +463,7 @@ update_window_position (GtkSourceCompletion *completion) GtkTextIter iter; gboolean iter_set = FALSE; - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } @@ -474,7 +475,7 @@ update_window_position (GtkSourceCompletion *completion) * in this case). When a new population is done, this function will be * called again, so no problem. */ - if (completion->priv->context == NULL) + if (completion->context == NULL) { return; } @@ -484,12 +485,12 @@ update_window_position (GtkSourceCompletion *completion) GtkTextIter context_iter; gboolean valid_context; - valid_context = gtk_source_completion_context_get_iter (completion->priv->context, + valid_context = gtk_source_completion_context_get_iter (completion->context, &context_iter); if (valid_context && gtk_source_completion_provider_get_start_iter (provider, - completion->priv->context, + completion->context, proposal, &iter)) { @@ -503,11 +504,11 @@ update_window_position (GtkSourceCompletion *completion) if (!iter_set) { GtkTextIter end_word; - get_word_iter (completion->priv->buffer, &iter, &end_word); + get_word_iter (completion->buffer, &iter, &end_word); } - gtk_source_completion_info_move_to_iter (completion->priv->main_window, - GTK_TEXT_VIEW (completion->priv->view), + gtk_source_completion_info_move_to_iter (completion->main_window, + GTK_TEXT_VIEW (completion->view), &iter); } @@ -515,7 +516,7 @@ static void set_info_widget (GtkSourceCompletion *completion, GtkWidget *new_widget) { - GtkWidget *cur_widget = gtk_bin_get_child (GTK_BIN (completion->priv->info_window)); + GtkWidget *cur_widget = gtk_bin_get_child (GTK_BIN (completion->info_window)); if (cur_widget == new_widget) { @@ -524,10 +525,10 @@ set_info_widget (GtkSourceCompletion *completion, if (cur_widget != NULL) { - gtk_container_remove (GTK_CONTAINER (completion->priv->info_window), cur_widget); + gtk_container_remove (GTK_CONTAINER (completion->info_window), cur_widget); } - gtk_container_add (GTK_CONTAINER (completion->priv->info_window), new_widget); + gtk_container_add (GTK_CONTAINER (completion->info_window), new_widget); } static void @@ -539,7 +540,7 @@ update_proposal_info_state (GtkSourceCompletion *completion) if (!get_selected_proposal (completion, &provider, &proposal)) { - gtk_widget_set_sensitive (GTK_WIDGET (completion->priv->info_button), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (completion->info_button), FALSE); return; } @@ -548,11 +549,11 @@ update_proposal_info_state (GtkSourceCompletion *completion) if (info_widget != NULL) { set_info_widget (completion, info_widget); - gtk_widget_set_sensitive (GTK_WIDGET (completion->priv->info_button), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (completion->info_button), TRUE); gtk_source_completion_provider_update_info (provider, proposal, - completion->priv->info_window); + completion->info_window); } else { @@ -560,15 +561,15 @@ update_proposal_info_state (GtkSourceCompletion *completion) if (text != NULL) { - set_info_widget (completion, GTK_WIDGET (completion->priv->default_info)); - gtk_widget_set_sensitive (GTK_WIDGET (completion->priv->info_button), TRUE); + set_info_widget (completion, GTK_WIDGET (completion->default_info)); + gtk_widget_set_sensitive (GTK_WIDGET (completion->info_button), TRUE); - gtk_label_set_markup (completion->priv->default_info, text); + gtk_label_set_markup (completion->default_info, text); g_free (text); } else { - gtk_widget_set_sensitive (GTK_WIDGET (completion->priv->info_button), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (completion->info_button), FALSE); } } @@ -579,14 +580,14 @@ update_proposal_info_state (GtkSourceCompletion *completion) static void update_info_window_visibility (GtkSourceCompletion *completion) { - if (gtk_widget_get_sensitive (GTK_WIDGET (completion->priv->info_button)) && - gtk_toggle_button_get_active (completion->priv->info_button)) + if (gtk_widget_get_sensitive (GTK_WIDGET (completion->info_button)) && + gtk_toggle_button_get_active (completion->info_button)) { - gtk_widget_show (GTK_WIDGET (completion->priv->info_window)); + gtk_widget_show (GTK_WIDGET (completion->info_window)); } else { - gtk_widget_hide (GTK_WIDGET (completion->priv->info_window)); + gtk_widget_hide (GTK_WIDGET (completion->info_window)); } } @@ -600,33 +601,33 @@ update_proposal_info (GtkSourceCompletion *completion) static void gtk_source_completion_show_default (GtkSourceCompletion *completion) { - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } - gtk_widget_show (GTK_WIDGET (completion->priv->main_window)); + gtk_widget_show (GTK_WIDGET (completion->main_window)); /* Do the autosize when the widget is visible. It doesn't work if it is * done before. */ - gtk_tree_view_columns_autosize (completion->priv->tree_view_proposals); + gtk_tree_view_columns_autosize (completion->tree_view_proposals); - if (!completion->priv->remember_info_visibility) + if (!completion->remember_info_visibility) { - gtk_toggle_button_set_active (completion->priv->info_button, FALSE); + gtk_toggle_button_set_active (completion->info_button, FALSE); } update_proposal_info (completion); - gtk_widget_grab_focus (GTK_WIDGET (completion->priv->view)); + gtk_widget_grab_focus (GTK_WIDGET (completion->view)); } static void gtk_source_completion_hide_default (GtkSourceCompletion *completion) { - gtk_widget_hide (GTK_WIDGET (completion->priv->info_window)); - gtk_widget_hide (GTK_WIDGET (completion->priv->main_window)); + gtk_widget_hide (GTK_WIDGET (completion->info_window)); + gtk_widget_hide (GTK_WIDGET (completion->main_window)); } static void @@ -641,38 +642,38 @@ gtk_source_completion_proposals_size_allocate (GtkSourceCompletion *completion, gint horizontal_separator; gint x_offset = 0; - if (!gtk_widget_get_realized (GTK_WIDGET (completion->priv->tree_view_proposals))) + if (!gtk_widget_get_realized (GTK_WIDGET (completion->tree_view_proposals))) { return; } - gtk_widget_style_get (GTK_WIDGET (completion->priv->tree_view_proposals), + gtk_widget_style_get (GTK_WIDGET (completion->tree_view_proposals), "focus-padding", &focus_padding, "horizontal-separator", &horizontal_separator, NULL); - column = gtk_tree_view_get_column (completion->priv->tree_view_proposals, 1); + column = gtk_tree_view_get_column (completion->tree_view_proposals, 1); column_offset = gtk_tree_view_column_get_x_offset (column); gtk_tree_view_column_cell_get_position (column, - completion->priv->cell_renderer_proposal, + completion->cell_renderer_proposal, &cell_offset, NULL); x_offset = column_offset + cell_offset + horizontal_separator + focus_padding; - gtk_tree_view_convert_bin_window_to_widget_coords (completion->priv->tree_view_proposals, + gtk_tree_view_convert_bin_window_to_widget_coords (completion->tree_view_proposals, x_offset, 0, &x_offset, NULL); - gtk_widget_translate_coordinates (GTK_WIDGET (completion->priv->tree_view_proposals), - GTK_WIDGET (completion->priv->main_window), + gtk_widget_translate_coordinates (GTK_WIDGET (completion->tree_view_proposals), + GTK_WIDGET (completion->main_window), x_offset, 0, &x_offset, NULL); - _gtk_source_completion_info_set_xoffset (completion->priv->main_window, -x_offset); + _gtk_source_completion_info_set_xoffset (completion->main_window, -x_offset); } static void @@ -685,7 +686,7 @@ gtk_source_completion_activate_proposal (GtkSourceCompletion *completion) gboolean valid_context; gboolean activated; - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } @@ -701,8 +702,8 @@ gtk_source_completion_activate_proposal (GtkSourceCompletion *completion) activated = gtk_source_completion_provider_activate_proposal (provider, proposal, &insert_iter); - valid_context = (completion->priv->context != NULL && - gtk_source_completion_context_get_iter (completion->priv->context, + valid_context = (completion->context != NULL && + gtk_source_completion_context_get_iter (completion->context, &context_iter)); if (!activated && valid_context) @@ -711,20 +712,20 @@ gtk_source_completion_activate_proposal (GtkSourceCompletion *completion) gchar *text = gtk_source_completion_proposal_get_text (proposal); gboolean has_start = gtk_source_completion_provider_get_start_iter (provider, - completion->priv->context, + completion->context, proposal, &start_iter); if (has_start) { - gtk_text_buffer_begin_user_action (completion->priv->buffer); - gtk_text_buffer_delete (completion->priv->buffer, &start_iter, &insert_iter); - gtk_text_buffer_insert (completion->priv->buffer, &start_iter, text, -1); - gtk_text_buffer_end_user_action (completion->priv->buffer); + gtk_text_buffer_begin_user_action (completion->buffer); + gtk_text_buffer_delete (completion->buffer, &start_iter, &insert_iter); + gtk_text_buffer_insert (completion->buffer, &start_iter, text, -1); + gtk_text_buffer_end_user_action (completion->buffer); } else { - replace_current_word (completion->priv->buffer, text); + replace_current_word (completion->buffer, text); } g_free (text); @@ -749,12 +750,12 @@ update_info_position (GtkSourceCompletion *completion) gint width, height; gint info_width; - gtk_window_get_position (GTK_WINDOW (completion->priv->main_window), &x, &y); - gtk_window_get_size (GTK_WINDOW (completion->priv->main_window), &width, &height); - gtk_window_get_size (GTK_WINDOW (completion->priv->info_window), &info_width, NULL); + gtk_window_get_position (GTK_WINDOW (completion->main_window), &x, &y); + gtk_window_get_size (GTK_WINDOW (completion->main_window), &width, &height); + gtk_window_get_size (GTK_WINDOW (completion->info_window), &info_width, NULL); - display = gtk_widget_get_display (GTK_WIDGET (completion->priv->main_window)); - window = gtk_widget_get_window (GTK_WIDGET (completion->priv->main_window)); + display = gtk_widget_get_display (GTK_WIDGET (completion->main_window)); + window = gtk_widget_get_window (GTK_WIDGET (completion->main_window)); monitor = gdk_display_get_monitor_at_window (display, window); gdk_monitor_get_geometry (monitor, &geom); @@ -768,13 +769,13 @@ update_info_position (GtkSourceCompletion *completion) x += width; } - gtk_window_move (GTK_WINDOW (completion->priv->info_window), x, y); + gtk_window_move (GTK_WINDOW (completion->info_window), x, y); } static GtkSourceCompletionProvider * get_visible_provider (GtkSourceCompletion *completion) { - GList *visible = gtk_source_completion_model_get_visible_providers (completion->priv->model_proposals); + GList *visible = gtk_source_completion_model_get_visible_providers (completion->model_proposals); if (visible != NULL) { @@ -791,7 +792,7 @@ get_num_visible_providers (GtkSourceCompletion *completion, guint *num, guint *current) { - GList *providers = gtk_source_completion_model_get_providers (completion->priv->model_proposals); + GList *providers = gtk_source_completion_model_get_providers (completion->model_proposals); GtkSourceCompletionProvider *visible = get_visible_provider (completion); *num = g_list_length (providers); @@ -822,8 +823,8 @@ update_selection_label (GtkSourceCompletion *completion) if (num <= 1) { /* At most one provider. All the proposals are shown. */ - gtk_image_clear (completion->priv->selection_image); - gtk_widget_hide (GTK_WIDGET (completion->priv->selection_label)); + gtk_image_clear (completion->selection_image); + gtk_widget_hide (GTK_WIDGET (completion->selection_label)); return; } @@ -835,7 +836,7 @@ update_selection_label (GtkSourceCompletion *completion) popup, telling that all completion pages are shown. */ name = g_strdup_printf("%s", _("All")); - gtk_image_clear (completion->priv->selection_image); + gtk_image_clear (completion->selection_image); } else { @@ -843,13 +844,13 @@ update_selection_label (GtkSourceCompletion *completion) name = g_markup_escape_text (temp_name, -1); g_free (temp_name); - gtk_image_set_from_pixbuf (completion->priv->selection_image, + gtk_image_set_from_pixbuf (completion->selection_image, gtk_source_completion_provider_get_icon (visible)); } selection_text = g_strdup_printf ("%s (%d/%d)", name, pos + 1, num + 1); - gtk_label_set_markup (completion->priv->selection_label, selection_text); - gtk_widget_show (GTK_WIDGET (completion->priv->selection_label)); + gtk_label_set_markup (completion->selection_label, selection_text); + gtk_widget_show (GTK_WIDGET (completion->selection_label)); g_free (selection_text); g_free (name); @@ -863,20 +864,20 @@ get_next_iter (GtkSourceCompletion *completion, GtkTreeSelection *selection; gboolean has_selection; - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); has_selection = gtk_tree_selection_get_selected (selection, NULL, iter); if (!has_selection) { - return gtk_source_completion_model_first_proposal (completion->priv->model_proposals, + return gtk_source_completion_model_first_proposal (completion->model_proposals, iter); } while (num > 0) { - if (!gtk_source_completion_model_next_proposal (completion->priv->model_proposals, iter)) + if (!gtk_source_completion_model_next_proposal (completion->model_proposals, iter)) { - return gtk_source_completion_model_last_proposal (completion->priv->model_proposals, + return gtk_source_completion_model_last_proposal (completion->model_proposals, iter); } @@ -894,21 +895,21 @@ get_previous_iter (GtkSourceCompletion *completion, GtkTreeSelection *selection; gboolean has_selection; - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); has_selection = gtk_tree_selection_get_selected (selection, NULL, iter); if (!has_selection) { - return gtk_source_completion_model_last_proposal (completion->priv->model_proposals, + return gtk_source_completion_model_last_proposal (completion->model_proposals, iter); } while (num > 0) { - if (!gtk_source_completion_model_previous_proposal (completion->priv->model_proposals, + if (!gtk_source_completion_model_previous_proposal (completion->model_proposals, iter)) { - return gtk_source_completion_model_first_proposal (completion->priv->model_proposals, + return gtk_source_completion_model_first_proposal (completion->model_proposals, iter); } @@ -930,12 +931,12 @@ gtk_source_completion_move_cursor (GtkSourceCompletion *completion, { if (num > 0) { - ok = gtk_source_completion_model_last_proposal (completion->priv->model_proposals, + ok = gtk_source_completion_model_last_proposal (completion->model_proposals, &iter); } else { - ok = gtk_source_completion_model_first_proposal (completion->priv->model_proposals, + ok = gtk_source_completion_model_first_proposal (completion->model_proposals, &iter); } } @@ -943,7 +944,7 @@ gtk_source_completion_move_cursor (GtkSourceCompletion *completion, { if (step == GTK_SCROLL_PAGES) { - num *= completion->priv->proposal_page_size; + num *= completion->proposal_page_size; } if (num > 0) @@ -960,7 +961,7 @@ gtk_source_completion_move_cursor (GtkSourceCompletion *completion, { GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); gtk_tree_selection_select_iter (selection, &iter); scroll_to_iter (completion, &iter); @@ -970,7 +971,7 @@ gtk_source_completion_move_cursor (GtkSourceCompletion *completion, static GList * get_last_provider (GtkSourceCompletion *completion) { - GList *providers = gtk_source_completion_model_get_providers (completion->priv->model_proposals); + GList *providers = gtk_source_completion_model_get_providers (completion->model_proposals); GList *ret; g_return_val_if_fail (providers != NULL, NULL); @@ -1040,8 +1041,8 @@ get_next_provider (GtkSourceCompletion *completion, GList *position; GList *ret; - providers = gtk_source_completion_model_get_providers (completion->priv->model_proposals); - visible_providers = gtk_source_completion_model_get_visible_providers (completion->priv->model_proposals); + providers = gtk_source_completion_model_get_providers (completion->model_proposals); + visible_providers = gtk_source_completion_model_get_visible_providers (completion->model_proposals); if (visible_providers == NULL) { @@ -1077,8 +1078,8 @@ get_previous_provider (GtkSourceCompletion *completion, GList *position; GList *ret; - providers = gtk_source_completion_model_get_providers (completion->priv->model_proposals); - visible_providers = gtk_source_completion_model_get_visible_providers (completion->priv->model_proposals); + providers = gtk_source_completion_model_get_providers (completion->model_proposals); + visible_providers = gtk_source_completion_model_get_visible_providers (completion->model_proposals); if (visible_providers == NULL) { @@ -1127,7 +1128,7 @@ gtk_source_completion_move_page (GtkSourceCompletion *completion, { if (step == GTK_SCROLL_PAGES) { - num *= completion->priv->provider_page_size; + num *= completion->provider_page_size; } if (num > 0) @@ -1140,14 +1141,14 @@ gtk_source_completion_move_page (GtkSourceCompletion *completion, } } - gtk_tree_view_set_model (completion->priv->tree_view_proposals, NULL); - gtk_tree_view_columns_autosize (completion->priv->tree_view_proposals); + gtk_tree_view_set_model (completion->tree_view_proposals, NULL); + gtk_tree_view_columns_autosize (completion->tree_view_proposals); - gtk_source_completion_model_set_visible_providers (completion->priv->model_proposals, + gtk_source_completion_model_set_visible_providers (completion->model_proposals, visible_providers); - gtk_tree_view_set_model (completion->priv->tree_view_proposals, - GTK_TREE_MODEL (completion->priv->model_proposals)); + gtk_tree_view_set_model (completion->tree_view_proposals, + GTK_TREE_MODEL (completion->model_proposals)); update_selection_label (completion); check_first_selected (completion); @@ -1163,26 +1164,26 @@ get_accel_at_iter (GtkSourceCompletion *completion, GtkTreeIter it; guint accel; - if (gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, iter)) + if (gtk_source_completion_model_iter_is_header (completion->model_proposals, iter)) { return -1; } - if (!gtk_source_completion_model_first_proposal (completion->priv->model_proposals, &it)) + if (!gtk_source_completion_model_first_proposal (completion->model_proposals, &it)) { g_return_val_if_reached (-1); } - for (accel = 0; accel < completion->priv->num_accelerators; accel++) + for (accel = 0; accel < completion->num_accelerators; accel++) { - if (gtk_source_completion_model_iter_equal (completion->priv->model_proposals, + if (gtk_source_completion_model_iter_equal (completion->model_proposals, iter, &it)) { return accel; } - if (!gtk_source_completion_model_next_proposal (completion->priv->model_proposals, &it)) + if (!gtk_source_completion_model_next_proposal (completion->model_proposals, &it)) { return -1; } @@ -1218,32 +1219,32 @@ activate_by_accelerator (GtkSourceCompletion *completion, GtkTreeIter iter; gint i; - if (completion->priv->num_accelerators == 0) + if (completion->num_accelerators == 0) { return FALSE; } num = num == 0 ? 9 : num - 1; - if (num < 0 || completion->priv->num_accelerators <= (guint)num) + if (num < 0 || completion->num_accelerators <= (guint)num) { return FALSE; } - if (!gtk_source_completion_model_first_proposal (completion->priv->model_proposals, &iter)) + if (!gtk_source_completion_model_first_proposal (completion->model_proposals, &iter)) { return FALSE; } for (i = 0; i < num; i++) { - if (!gtk_source_completion_model_next_proposal (completion->priv->model_proposals, &iter)) + if (!gtk_source_completion_model_next_proposal (completion->model_proposals, &iter)) { return FALSE; } } - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); gtk_tree_selection_select_iter (selection, &iter); gtk_source_completion_activate_proposal (completion); @@ -1288,14 +1289,14 @@ view_key_press_event_cb (GtkSourceView *view, GdkModifierType mod; GtkBindingSet *binding_set; - if (!gtk_widget_get_visible (GTK_WIDGET (completion->priv->main_window))) + if (!gtk_widget_get_visible (GTK_WIDGET (completion->main_window))) { return FALSE; } if (G_UNLIKELY (!mnemonic_keyval_set)) { - const gchar *label_text = gtk_button_get_label (GTK_BUTTON (completion->priv->info_button)); + const gchar *label_text = gtk_button_get_label (GTK_BUTTON (completion->info_button)); GtkWidget *label = gtk_label_new_with_mnemonic (label_text); g_object_ref_sink (label); @@ -1310,10 +1311,10 @@ view_key_press_event_cb (GtkSourceView *view, /* Handle info button mnemonic */ if ((mod & GDK_MOD1_MASK) != 0 && event->keyval == mnemonic_keyval && - gtk_widget_get_sensitive (GTK_WIDGET (completion->priv->info_button))) + gtk_widget_get_sensitive (GTK_WIDGET (completion->info_button))) { - gtk_toggle_button_set_active (completion->priv->info_button, - !gtk_toggle_button_get_active (completion->priv->info_button)); + gtk_toggle_button_set_active (completion->info_button, + !gtk_toggle_button_get_active (completion->info_button)); return TRUE; } @@ -1326,7 +1327,7 @@ view_key_press_event_cb (GtkSourceView *view, } } - binding_set = gtk_binding_set_by_class (GTK_SOURCE_COMPLETION_GET_CLASS (completion)); + binding_set = gtk_binding_set_by_class (G_OBJECT_GET_CLASS (completion)); if (gtk_binding_set_activate (binding_set, event->keyval, @@ -1356,22 +1357,22 @@ update_transient_for_info (GObject *window, GParamSpec *spec, GtkSourceCompletion *completion) { - gtk_window_set_transient_for (GTK_WINDOW (completion->priv->info_window), - gtk_window_get_transient_for (GTK_WINDOW (completion->priv->main_window))); + gtk_window_set_transient_for (GTK_WINDOW (completion->info_window), + gtk_window_get_transient_for (GTK_WINDOW (completion->main_window))); } static void replace_model (GtkSourceCompletion *completion) { - if (completion->priv->model_proposals != NULL) + if (completion->model_proposals != NULL) { - g_object_unref (completion->priv->model_proposals); + g_object_unref (completion->model_proposals); } - completion->priv->model_proposals = gtk_source_completion_model_new (); + completion->model_proposals = gtk_source_completion_model_new (); - gtk_source_completion_model_set_show_headers (completion->priv->model_proposals, - completion->priv->show_headers); + gtk_source_completion_model_set_show_headers (completion->model_proposals, + completion->show_headers); } /* Takes ownership of @providers and @context. */ @@ -1391,13 +1392,13 @@ update_completion (GtkSourceCompletion *completion, /* Make sure to first cancel any running completion */ reset_completion (completion); - completion->priv->context = context_copy; - completion->priv->running_providers = g_list_copy (providers_copy); - completion->priv->active_providers = g_list_copy (providers_copy); + completion->context = context_copy; + completion->running_providers = g_list_copy (providers_copy); + completion->active_providers = g_list_copy (providers_copy); /* Create a new CompletionModel */ - gtk_tree_view_set_model (completion->priv->tree_view_proposals, NULL); - gtk_tree_view_columns_autosize (completion->priv->tree_view_proposals); + gtk_tree_view_set_model (completion->tree_view_proposals, NULL); + gtk_tree_view_columns_autosize (completion->tree_view_proposals); replace_model (completion); @@ -1421,11 +1422,11 @@ auto_completion_final (GtkSourceCompletion *completion) /* Store and set to NULL because update_completion will cancel the last completion, which will also remove the timeout source which in turn would free these guys */ - GtkSourceCompletionContext *context = completion->priv->auto_completion_context; - GList *selection = completion->priv->auto_completion_selection; + GtkSourceCompletionContext *context = completion->auto_completion_context; + GList *selection = completion->auto_completion_selection; - completion->priv->auto_completion_context = NULL; - completion->priv->auto_completion_selection = NULL; + completion->auto_completion_context = NULL; + completion->auto_completion_selection = NULL; update_completion (completion, selection, context); @@ -1437,14 +1438,14 @@ auto_completion_final (GtkSourceCompletion *completion) static void auto_completion_destroy (GtkSourceCompletion *completion) { - if (completion->priv->auto_completion_context != NULL) + if (completion->auto_completion_context != NULL) { - g_object_unref (completion->priv->auto_completion_context); - completion->priv->auto_completion_context = NULL; + g_object_unref (completion->auto_completion_context); + completion->auto_completion_context = NULL; } - g_list_free (completion->priv->auto_completion_selection); - completion->priv->auto_completion_selection = NULL; + g_list_free (completion->auto_completion_selection); + completion->auto_completion_selection = NULL; } static void @@ -1469,7 +1470,7 @@ start_interactive_completion (GtkSourceCompletion *completion, g_signal_emit (completion, signals[POPULATE_CONTEXT], 0, context); /* Select providers */ - providers = select_providers (completion->priv->providers, context); + providers = select_providers (completion->providers, context); if (providers == NULL) { @@ -1479,10 +1480,10 @@ start_interactive_completion (GtkSourceCompletion *completion, /* Create the timeout */ delay = minimum_auto_complete_delay (completion, providers); - completion->priv->auto_completion_context = context; - completion->priv->auto_completion_selection = providers; + completion->auto_completion_context = context; + completion->auto_completion_selection = providers; - completion->priv->show_timed_out_id = + completion->show_timed_out_id = g_timeout_add_full (G_PRIORITY_DEFAULT, delay, (GSourceFunc)auto_completion_final, @@ -1496,20 +1497,20 @@ update_active_completion (GtkSourceCompletion *completion, { GList *selected_providers; - g_assert (completion->priv->context != NULL); + g_assert (completion->context != NULL); - g_object_set (completion->priv->context, + g_object_set (completion->context, "iter", new_iter, NULL); - selected_providers = select_providers (completion->priv->providers, - completion->priv->context); + selected_providers = select_providers (completion->providers, + completion->context); if (selected_providers != NULL) { update_completion (completion, selected_providers, - completion->priv->context); + completion->context); g_list_free (selected_providers); } @@ -1525,7 +1526,7 @@ buffer_delete_range_cb (GtkTextBuffer *buffer, GtkTextIter *end, GtkSourceCompletion *completion) { - if (completion->priv->context != NULL) + if (completion->context != NULL) { update_active_completion (completion, start); } @@ -1538,7 +1539,7 @@ buffer_insert_text_cb (GtkTextBuffer *buffer, gint len, GtkSourceCompletion *completion) { - if (completion->priv->context != NULL) + if (completion->context != NULL) { update_active_completion (completion, location); } @@ -1554,23 +1555,23 @@ update_bottom_bar_visibility (GtkSourceCompletion *completion) GList *providers; guint nb_providers; - providers = gtk_source_completion_model_get_providers (completion->priv->model_proposals); + providers = gtk_source_completion_model_get_providers (completion->model_proposals); nb_providers = g_list_length (providers); g_list_free (providers); if (nb_providers > 1) { - gtk_widget_show (completion->priv->bottom_bar); + gtk_widget_show (completion->bottom_bar); return; } - if (gtk_source_completion_model_has_info (completion->priv->model_proposals)) + if (gtk_source_completion_model_has_info (completion->model_proposals)) { - gtk_widget_show (completion->priv->bottom_bar); + gtk_widget_show (completion->bottom_bar); } else { - gtk_widget_hide (completion->priv->bottom_bar); + gtk_widget_hide (completion->bottom_bar); } } @@ -1605,7 +1606,7 @@ style_context_changed (GtkStyleContext *style_context, pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_WEIGHT); } - g_object_set (completion->priv->cell_renderer_proposal, + g_object_set (completion->cell_renderer_proposal, "font-desc", font_desc, NULL); @@ -1616,14 +1617,14 @@ static void populating_done (GtkSourceCompletion *completion, GtkSourceCompletionContext *context) { - if (gtk_source_completion_model_is_empty (completion->priv->model_proposals, TRUE)) + if (gtk_source_completion_model_is_empty (completion->model_proposals, TRUE)) { gtk_source_completion_hide (completion); return; } - gtk_tree_view_set_model (completion->priv->tree_view_proposals, - GTK_TREE_MODEL (completion->priv->model_proposals)); + gtk_tree_view_set_model (completion->tree_view_proposals, + GTK_TREE_MODEL (completion->model_proposals)); update_selection_label (completion); update_bottom_bar_visibility (completion); @@ -1637,7 +1638,7 @@ populating_done (GtkSourceCompletion *completion, update_window_position (completion); } - if (!gtk_widget_get_visible (GTK_WIDGET (completion->priv->main_window))) + if (!gtk_widget_get_visible (GTK_WIDGET (completion->main_window))) { g_signal_emit (completion, signals[SHOW], 0); } @@ -1650,32 +1651,32 @@ gtk_source_completion_dispose (GObject *object) reset_completion (completion); - if (completion->priv->view != NULL) + if (completion->view != NULL) { - g_object_remove_weak_pointer (G_OBJECT (completion->priv->view), - (gpointer *)&completion->priv->view); + g_object_remove_weak_pointer (G_OBJECT (completion->view), + (gpointer *)&completion->view); - completion->priv->view = NULL; + completion->view = NULL; } - g_clear_object (&completion->priv->buffer); - g_clear_object (&completion->priv->default_info); - g_clear_object (&completion->priv->model_proposals); + g_clear_object (&completion->buffer); + g_clear_object (&completion->default_info); + g_clear_object (&completion->model_proposals); - if (completion->priv->info_window != NULL) + if (completion->info_window != NULL) { - gtk_widget_destroy (GTK_WIDGET (completion->priv->info_window)); - completion->priv->info_window = NULL; + gtk_widget_destroy (GTK_WIDGET (completion->info_window)); + completion->info_window = NULL; } - if (completion->priv->main_window != NULL) + if (completion->main_window != NULL) { - gtk_widget_destroy (GTK_WIDGET (completion->priv->main_window)); - completion->priv->main_window = NULL; + gtk_widget_destroy (GTK_WIDGET (completion->main_window)); + completion->main_window = NULL; } - g_list_free_full (completion->priv->providers, g_object_unref); - completion->priv->providers = NULL; + g_list_free_full (completion->providers, g_object_unref); + completion->providers = NULL; G_OBJECT_CLASS (gtk_source_completion_parent_class)->dispose (object); } @@ -1689,11 +1690,11 @@ gtk_source_completion_dispose (GObject *object) static void block_interactive (GtkSourceCompletion *completion) { - g_signal_handlers_block_by_func (completion->priv->buffer, + g_signal_handlers_block_by_func (completion->buffer, buffer_insert_text_cb, completion); - g_signal_handlers_block_by_func (completion->priv->buffer, + g_signal_handlers_block_by_func (completion->buffer, buffer_delete_range_cb, completion); } @@ -1703,51 +1704,51 @@ connect_buffer (GtkSourceCompletion *completion) { GtkTextBuffer *new_buffer = NULL; - if (completion->priv->view != NULL) + if (completion->view != NULL) { - new_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (completion->priv->view)); + new_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (completion->view)); } - if (completion->priv->buffer == new_buffer) + if (completion->buffer == new_buffer) { return; } - if (completion->priv->buffer != NULL) + if (completion->buffer != NULL) { - g_signal_handlers_disconnect_by_func (completion->priv->buffer, + g_signal_handlers_disconnect_by_func (completion->buffer, buffer_mark_set_cb, completion); - g_signal_handlers_disconnect_by_func (completion->priv->buffer, + g_signal_handlers_disconnect_by_func (completion->buffer, gtk_source_completion_block_interactive, completion); - g_signal_handlers_disconnect_by_func (completion->priv->buffer, + g_signal_handlers_disconnect_by_func (completion->buffer, gtk_source_completion_unblock_interactive, completion); - g_signal_handlers_disconnect_by_func (completion->priv->buffer, + g_signal_handlers_disconnect_by_func (completion->buffer, buffer_delete_range_cb, completion); - g_signal_handlers_disconnect_by_func (completion->priv->buffer, + g_signal_handlers_disconnect_by_func (completion->buffer, buffer_insert_text_cb, completion); reset_completion (completion); - g_object_unref (completion->priv->buffer); + g_object_unref (completion->buffer); } - completion->priv->buffer = new_buffer; + completion->buffer = new_buffer; if (new_buffer == NULL) { return; } - g_object_ref (completion->priv->buffer); + g_object_ref (completion->buffer); g_signal_connect_object (new_buffer, "mark-set", @@ -1791,7 +1792,7 @@ connect_buffer (GtkSourceCompletion *completion) completion, G_CONNECT_AFTER); - if (completion->priv->block_interactive_num > 0) + if (completion->block_interactive_num > 0) { block_interactive (completion); } @@ -1801,37 +1802,37 @@ static void connect_view (GtkSourceCompletion *completion, GtkSourceView *view) { - g_assert (completion->priv->view == NULL); - completion->priv->view = view; + g_assert (completion->view == NULL); + completion->view = view; g_object_add_weak_pointer (G_OBJECT (view), - (gpointer *)&completion->priv->view); + (gpointer *)&completion->view); - g_signal_connect_object (completion->priv->view, + g_signal_connect_object (completion->view, "focus-out-event", G_CALLBACK (hide_completion_cb), completion, G_CONNECT_SWAPPED); - g_signal_connect_object (completion->priv->view, + g_signal_connect_object (completion->view, "button-press-event", G_CALLBACK (hide_completion_cb), completion, G_CONNECT_SWAPPED); - g_signal_connect_object (completion->priv->view, + g_signal_connect_object (completion->view, "key-press-event", G_CALLBACK (view_key_press_event_cb), completion, 0); - g_signal_connect_object (completion->priv->view, + g_signal_connect_object (completion->view, "paste-clipboard", G_CALLBACK (gtk_source_completion_block_interactive), completion, G_CONNECT_SWAPPED); - g_signal_connect_object (completion->priv->view, + g_signal_connect_object (completion->view, "paste-clipboard", G_CALLBACK (gtk_source_completion_unblock_interactive), completion, @@ -1839,7 +1840,7 @@ connect_view (GtkSourceCompletion *completion, connect_buffer (completion); - g_signal_connect_object (completion->priv->view, + g_signal_connect_object (completion->view, "notify::buffer", G_CALLBACK (connect_buffer), completion, @@ -1861,31 +1862,31 @@ gtk_source_completion_get_property (GObject *object, switch (prop_id) { case PROP_VIEW: - g_value_set_object (value, completion->priv->view); + g_value_set_object (value, completion->view); break; case PROP_REMEMBER_INFO_VISIBILITY: - g_value_set_boolean (value, completion->priv->remember_info_visibility); + g_value_set_boolean (value, completion->remember_info_visibility); break; case PROP_SELECT_ON_SHOW: - g_value_set_boolean (value, completion->priv->select_on_show); + g_value_set_boolean (value, completion->select_on_show); break; case PROP_SHOW_HEADERS: - g_value_set_boolean (value, completion->priv->show_headers); + g_value_set_boolean (value, completion->show_headers); break; case PROP_SHOW_ICONS: - g_value_set_boolean (value, completion->priv->show_icons); + g_value_set_boolean (value, completion->show_icons); break; case PROP_ACCELERATORS: - g_value_set_uint (value, completion->priv->num_accelerators); + g_value_set_uint (value, completion->num_accelerators); break; case PROP_AUTO_COMPLETE_DELAY: - g_value_set_uint (value, completion->priv->auto_complete_delay); + g_value_set_uint (value, completion->auto_complete_delay); break; case PROP_PROPOSAL_PAGE_SIZE: - g_value_set_uint (value, completion->priv->proposal_page_size); + g_value_set_uint (value, completion->proposal_page_size); break; case PROP_PROVIDER_PAGE_SIZE: - g_value_set_uint (value, completion->priv->provider_page_size); + g_value_set_uint (value, completion->provider_page_size); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1911,34 +1912,34 @@ gtk_source_completion_set_property (GObject *object, connect_view (completion, g_value_get_object (value)); break; case PROP_REMEMBER_INFO_VISIBILITY: - completion->priv->remember_info_visibility = g_value_get_boolean (value); + completion->remember_info_visibility = g_value_get_boolean (value); break; case PROP_SELECT_ON_SHOW: - completion->priv->select_on_show = g_value_get_boolean (value); + completion->select_on_show = g_value_get_boolean (value); break; case PROP_SHOW_HEADERS: - completion->priv->show_headers = g_value_get_boolean (value); + completion->show_headers = g_value_get_boolean (value); - if (completion->priv->model_proposals != NULL) + if (completion->model_proposals != NULL) { - gtk_source_completion_model_set_show_headers (completion->priv->model_proposals, - completion->priv->show_headers); + gtk_source_completion_model_set_show_headers (completion->model_proposals, + completion->show_headers); } break; case PROP_SHOW_ICONS: - completion->priv->show_icons = g_value_get_boolean (value); + completion->show_icons = g_value_get_boolean (value); break; case PROP_ACCELERATORS: - completion->priv->num_accelerators = g_value_get_uint (value); + completion->num_accelerators = g_value_get_uint (value); break; case PROP_AUTO_COMPLETE_DELAY: - completion->priv->auto_complete_delay = g_value_get_uint (value); + completion->auto_complete_delay = g_value_get_uint (value); break; case PROP_PROPOSAL_PAGE_SIZE: - completion->priv->proposal_page_size = g_value_get_uint (value); + completion->proposal_page_size = g_value_get_uint (value); break; case PROP_PROVIDER_PAGE_SIZE: - completion->priv->provider_page_size = g_value_get_uint (value); + completion->provider_page_size = g_value_get_uint (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1957,7 +1958,7 @@ selection_func (GtkTreeSelection *selection, gtk_tree_model_get_iter (model, &iter, path); - if (gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, + if (gtk_source_completion_model_iter_is_header (completion->model_proposals, &iter)) { /* A header must never be selected */ @@ -1975,7 +1976,7 @@ accelerators_notify_cb (GtkSourceCompletion *completion, GParamSpec *pspec, GtkTreeViewColumn *column) { - gtk_tree_view_column_set_visible (column, completion->priv->num_accelerators > 0); + gtk_tree_view_column_set_visible (column, completion->num_accelerators > 0); } static void @@ -2034,21 +2035,21 @@ init_tree_view (GtkSourceCompletion *completion, GdkRGBA* background_color = NULL; GdkRGBA foreground_color; - completion->priv->tree_view_proposals = GTK_TREE_VIEW (gtk_builder_get_object (builder, "tree_view_proposals")); + completion->tree_view_proposals = GTK_TREE_VIEW (gtk_builder_get_object (builder, "tree_view_proposals")); - g_signal_connect_swapped (completion->priv->tree_view_proposals, + g_signal_connect_swapped (completion->tree_view_proposals, "row-activated", G_CALLBACK (gtk_source_completion_activate_proposal), completion); - g_signal_connect_swapped (completion->priv->tree_view_proposals, + g_signal_connect_swapped (completion->tree_view_proposals, "size-allocate", G_CALLBACK (gtk_source_completion_proposals_size_allocate), completion); /* Selection */ - selection = gtk_tree_view_get_selection (completion->priv->tree_view_proposals); + selection = gtk_tree_view_get_selection (completion->tree_view_proposals); gtk_tree_selection_set_select_function (selection, (GtkTreeSelectionFunc)selection_func, @@ -2080,7 +2081,7 @@ init_tree_view (GtkSourceCompletion *completion, "cell-background-set", GTK_SOURCE_COMPLETION_MODEL_COLUMN_IS_HEADER, NULL); - style_context = gtk_widget_get_style_context (GTK_WIDGET (completion->priv->tree_view_proposals)); + style_context = gtk_widget_get_style_context (GTK_WIDGET (completion->tree_view_proposals)); gtk_style_context_save (style_context); gtk_style_context_set_state (style_context, GTK_STATE_FLAG_INSENSITIVE); @@ -2107,7 +2108,7 @@ init_tree_view (GtkSourceCompletion *completion, /* Proposal text cell renderer */ cell_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (builder, "cell_renderer_proposal")); - completion->priv->cell_renderer_proposal = cell_renderer; + completion->cell_renderer_proposal = cell_renderer; column = GTK_TREE_VIEW_COLUMN (gtk_builder_get_object (builder, "tree_view_column_proposal")); @@ -2157,43 +2158,43 @@ static void init_main_window (GtkSourceCompletion *completion, GtkBuilder *builder) { - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } - completion->priv->main_window = GTK_SOURCE_COMPLETION_INFO (gtk_builder_get_object (builder, "main_window")); - completion->priv->info_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "info_button")); - completion->priv->selection_image = GTK_IMAGE (gtk_builder_get_object (builder, "selection_image")); - completion->priv->selection_label = GTK_LABEL (gtk_builder_get_object (builder, "selection_label")); - completion->priv->bottom_bar = GTK_WIDGET (gtk_builder_get_object (builder, "bottom_bar")); + completion->main_window = GTK_SOURCE_COMPLETION_INFO (gtk_builder_get_object (builder, "main_window")); + completion->info_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "info_button")); + completion->selection_image = GTK_IMAGE (gtk_builder_get_object (builder, "selection_image")); + completion->selection_label = GTK_LABEL (gtk_builder_get_object (builder, "selection_label")); + completion->bottom_bar = GTK_WIDGET (gtk_builder_get_object (builder, "bottom_bar")); - gtk_container_set_border_width (GTK_CONTAINER (completion->priv->main_window), 0); + gtk_container_set_border_width (GTK_CONTAINER (completion->main_window), 0); - gtk_window_set_attached_to (GTK_WINDOW (completion->priv->main_window), - GTK_WIDGET (completion->priv->view)); + gtk_window_set_attached_to (GTK_WINDOW (completion->main_window), + GTK_WIDGET (completion->view)); - g_signal_connect (completion->priv->main_window, + g_signal_connect (completion->main_window, "configure-event", G_CALLBACK (gtk_source_completion_configure_event), completion); - g_signal_connect_swapped (completion->priv->main_window, + g_signal_connect_swapped (completion->main_window, "size-allocate", G_CALLBACK (update_window_position), completion); - g_signal_connect (completion->priv->main_window, + g_signal_connect (completion->main_window, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL); - g_signal_connect (completion->priv->main_window, + g_signal_connect (completion->main_window, "notify::transient-for", G_CALLBACK (update_transient_for_info), completion); - g_signal_connect_swapped (completion->priv->info_button, + g_signal_connect_swapped (completion->info_button, "toggled", G_CALLBACK (update_info_window_visibility), completion); @@ -2202,23 +2203,23 @@ init_main_window (GtkSourceCompletion *completion, static void init_info_window (GtkSourceCompletion *completion) { - completion->priv->info_window = gtk_source_completion_info_new (); - g_object_ref_sink (completion->priv->info_window); + completion->info_window = gtk_source_completion_info_new (); + g_object_ref_sink (completion->info_window); - gtk_window_set_attached_to (GTK_WINDOW (completion->priv->info_window), - GTK_WIDGET (completion->priv->main_window)); + gtk_window_set_attached_to (GTK_WINDOW (completion->info_window), + GTK_WIDGET (completion->main_window)); - g_signal_connect_swapped (completion->priv->info_window, + g_signal_connect_swapped (completion->info_window, "size-allocate", G_CALLBACK (update_info_position), completion); /* Default info widget */ - completion->priv->default_info = GTK_LABEL (gtk_label_new (NULL)); - g_object_ref_sink (completion->priv->default_info); + completion->default_info = GTK_LABEL (gtk_label_new (NULL)); + g_object_ref_sink (completion->default_info); - gtk_widget_show (GTK_WIDGET (completion->priv->default_info)); + gtk_widget_show (GTK_WIDGET (completion->default_info)); } static void @@ -2226,12 +2227,12 @@ connect_style_context (GtkSourceCompletion *completion) { GtkStyleContext *style_context; - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } - style_context = gtk_widget_get_style_context (GTK_WIDGET (completion->priv->view)); + style_context = gtk_widget_get_style_context (GTK_WIDGET (completion->view)); g_signal_connect_object (style_context, "changed", @@ -2287,13 +2288,6 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) object_class->dispose = gtk_source_completion_dispose; object_class->constructed = gtk_source_completion_constructed; - klass->show = gtk_source_completion_show_default; - klass->hide = gtk_source_completion_hide_default; - - klass->move_cursor = gtk_source_completion_move_cursor; - klass->move_page = gtk_source_completion_move_page; - klass->activate_proposal = gtk_source_completion_activate_proposal; - /** * GtkSourceCompletion:view: * @@ -2460,16 +2454,11 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) * will actually show the window. */ signals[SHOW] = - g_signal_new ("show", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionClass, show), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - g_signal_set_va_marshaller (signals[SHOW], - G_TYPE_FROM_CLASS (klass), - g_cclosure_marshal_VOID__VOIDv); + g_signal_new_class_handler ("show", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_source_completion_show_default), + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -2480,16 +2469,11 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) * will actually hide the window. */ signals[HIDE] = - g_signal_new ("hide", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionClass, hide), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - g_signal_set_va_marshaller (signals[HIDE], - G_TYPE_FROM_CLASS (klass), - g_cclosure_marshal_VOID__VOIDv); + g_signal_new_class_handler ("hide", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_source_completion_hide_default), + NULL, NULL, NULL, G_TYPE_NONE, 0); /** * GtkSourceCompletion::populate-context: @@ -2500,18 +2484,14 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) * You can use this signal to add additional attributes in the context. */ signals[POPULATE_CONTEXT] = - g_signal_new ("populate-context", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionClass, populate_context), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, - GTK_SOURCE_TYPE_COMPLETION_CONTEXT); - g_signal_set_va_marshaller (signals[POPULATE_CONTEXT], - G_TYPE_FROM_CLASS (klass), - g_cclosure_marshal_VOID__OBJECTv); + g_signal_new_class_handler ("populate-context", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + NULL, + NULL, NULL, NULL, + G_TYPE_NONE, + 1, + GTK_SOURCE_TYPE_COMPLETION_CONTEXT); /* Actions */ @@ -2538,17 +2518,17 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) * g_signal_emit_by_name() if they need to control the cursor * programmatically. */ - signals [MOVE_CURSOR] = - g_signal_new ("move-cursor", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionClass, move_cursor), - NULL, NULL, - _gtk_source_marshal_VOID__ENUM_INT, - G_TYPE_NONE, - 2, - GTK_TYPE_SCROLL_STEP, - G_TYPE_INT); + signals[MOVE_CURSOR] = + g_signal_new_class_handler ("move-cursor", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_source_completion_move_cursor), + NULL, NULL, + _gtk_source_marshal_VOID__ENUM_INT, + G_TYPE_NONE, + 2, + GTK_TYPE_SCROLL_STEP, + G_TYPE_INT); g_signal_set_va_marshaller (signals [MOVE_CURSOR], G_TYPE_FROM_CLASS (klass), _gtk_source_marshal_VOID__ENUM_INTv); @@ -2579,17 +2559,17 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) * g_signal_emit_by_name() if they need to control the page selection * programmatically. */ - signals [MOVE_PAGE] = - g_signal_new ("move-page", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionClass, move_page), - NULL, NULL, - _gtk_source_marshal_VOID__ENUM_INT, - G_TYPE_NONE, - 2, - GTK_TYPE_SCROLL_STEP, - G_TYPE_INT); + signals[MOVE_PAGE] = + g_signal_new_class_handler ("move-page", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_source_completion_move_page), + NULL, NULL, + _gtk_source_marshal_VOID__ENUM_INT, + G_TYPE_NONE, + 2, + GTK_TYPE_SCROLL_STEP, + G_TYPE_INT); g_signal_set_va_marshaller (signals [MOVE_PAGE], G_TYPE_FROM_CLASS (klass), _gtk_source_marshal_VOID__ENUM_INTv); @@ -2606,17 +2586,12 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) * g_signal_emit_by_name() if they need to control the proposal * activation programmatically. */ - signals [ACTIVATE_PROPOSAL] = - g_signal_new ("activate-proposal", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionClass, activate_proposal), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - g_signal_set_va_marshaller (signals [ACTIVATE_PROPOSAL], - G_TYPE_FROM_CLASS (klass), - g_cclosure_marshal_VOID__VOIDv); + signals[ACTIVATE_PROPOSAL] = + g_signal_new_class_handler ("activate-proposal", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_source_completion_activate_proposal), + NULL, NULL, NULL, G_TYPE_NONE, 0); /* Key bindings */ binding_set = gtk_binding_set_by_class (klass); @@ -2725,7 +2700,7 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass) static void gtk_source_completion_init (GtkSourceCompletion *completion) { - completion->priv = gtk_source_completion_get_instance_private (completion); + completion = gtk_source_completion_get_instance_private (completion); } static GObject * @@ -2761,23 +2736,23 @@ _gtk_source_completion_add_proposals (GtkSourceCompletion *completion, g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion)); g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context)); g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider)); - g_return_if_fail (completion->priv->context == context); + g_return_if_fail (completion->context == context); - item = g_list_find (completion->priv->running_providers, provider); + item = g_list_find (completion->running_providers, provider); g_return_if_fail (item != NULL); - gtk_source_completion_model_add_proposals (completion->priv->model_proposals, + gtk_source_completion_model_add_proposals (completion->model_proposals, provider, proposals); if (finished) { /* Remove provider from list of running providers */ - completion->priv->running_providers = - g_list_delete_link (completion->priv->running_providers, + completion->running_providers = + g_list_delete_link (completion->running_providers, item); - if (completion->priv->running_providers == NULL) + if (completion->running_providers == NULL) { populating_done (completion, context); } @@ -2814,7 +2789,7 @@ gtk_source_completion_start (GtkSourceCompletion *completion, g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), FALSE); g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context), FALSE); - if (completion->priv->view == NULL) + if (completion->view == NULL) { return FALSE; } @@ -2867,7 +2842,7 @@ GList * gtk_source_completion_get_providers (GtkSourceCompletion *completion) { g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL); - return completion->priv->providers; + return completion->providers; } GQuark @@ -2922,7 +2897,7 @@ gtk_source_completion_add_provider (GtkSourceCompletion *completion, g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), FALSE); g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), FALSE); - if (g_list_find (completion->priv->providers, provider) != NULL) + if (g_list_find (completion->providers, provider) != NULL) { if (error != NULL) { @@ -2935,7 +2910,7 @@ gtk_source_completion_add_provider (GtkSourceCompletion *completion, return FALSE; } - completion->priv->providers = g_list_append (completion->priv->providers, + completion->providers = g_list_append (completion->providers, g_object_ref (provider)); if (error != NULL) @@ -2967,7 +2942,7 @@ gtk_source_completion_remove_provider (GtkSourceCompletion *completion, g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), FALSE); g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), FALSE); - item = g_list_find (completion->priv->providers, provider); + item = g_list_find (completion->providers, provider); if (item == NULL) { @@ -2982,7 +2957,7 @@ gtk_source_completion_remove_provider (GtkSourceCompletion *completion, return FALSE; } - completion->priv->providers = g_list_delete_link (completion->priv->providers, item); + completion->providers = g_list_delete_link (completion->providers, item); g_object_unref (provider); @@ -3007,7 +2982,7 @@ gtk_source_completion_hide (GtkSourceCompletion *completion) reset_completion (completion); - if (gtk_widget_get_visible (GTK_WIDGET (completion->priv->main_window))) + if (gtk_widget_get_visible (GTK_WIDGET (completion->main_window))) { g_signal_emit (completion, signals[HIDE], 0); } @@ -3028,7 +3003,7 @@ gtk_source_completion_get_info_window (GtkSourceCompletion *completion) { g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL); - return completion->priv->info_window; + return completion->info_window; } /** @@ -3046,7 +3021,7 @@ gtk_source_completion_get_view (GtkSourceCompletion *completion) { g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL); - return completion->priv->view; + return completion->view; } /** @@ -3071,7 +3046,7 @@ gtk_source_completion_create_context (GtkSourceCompletion *completion, g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL); - if (completion->priv->view == NULL) + if (completion->view == NULL) { return NULL; } @@ -3106,17 +3081,17 @@ gtk_source_completion_block_interactive (GtkSourceCompletion *completion) { g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion)); - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } - if (completion->priv->block_interactive_num == 0) + if (completion->block_interactive_num == 0) { block_interactive (completion); } - completion->priv->block_interactive_num++; + completion->block_interactive_num++; } /** @@ -3132,24 +3107,24 @@ gtk_source_completion_unblock_interactive (GtkSourceCompletion *completion) { g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion)); - if (completion->priv->view == NULL) + if (completion->view == NULL) { return; } - if (completion->priv->block_interactive_num == 1) + if (completion->block_interactive_num == 1) { - g_signal_handlers_unblock_by_func (completion->priv->buffer, + g_signal_handlers_unblock_by_func (completion->buffer, buffer_insert_text_cb, completion); - g_signal_handlers_unblock_by_func (completion->priv->buffer, + g_signal_handlers_unblock_by_func (completion->buffer, buffer_delete_range_cb, completion); } - if (completion->priv->block_interactive_num > 0) + if (completion->block_interactive_num > 0) { - completion->priv->block_interactive_num--; + completion->block_interactive_num--; } } diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h index 030c30e3..13e1a6f3 100644 --- a/gtksourceview/gtksourcecompletion.h +++ b/gtksourceview/gtksourcecompletion.h @@ -33,12 +33,10 @@ G_BEGIN_DECLS /* * Type checking and casting macros */ -#define GTK_SOURCE_TYPE_COMPLETION (gtk_source_completion_get_type()) -#define GTK_SOURCE_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_COMPLETION, GtkSourceCompletion)) -#define GTK_SOURCE_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_COMPLETION, GtkSourceCompletionClass)) -#define GTK_SOURCE_IS_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_COMPLETION)) -#define GTK_SOURCE_IS_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION)) -#define GTK_SOURCE_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_COMPLETION, GtkSourceCompletionClass)) +#define GTK_SOURCE_TYPE_COMPLETION (gtk_source_completion_get_type()) + +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_FINAL_TYPE (GtkSourceCompletion, gtk_source_completion, GTK_SOURCE, COMPLETION, GObject) /** * GTK_SOURCE_COMPLETION_ERROR: @@ -47,10 +45,7 @@ G_BEGIN_DECLS * #GtkSourceCompletionError enumeration. See #GError for more information on * error domains. */ -#define GTK_SOURCE_COMPLETION_ERROR (gtk_source_completion_error_quark ()) - -typedef struct _GtkSourceCompletionPrivate GtkSourceCompletionPrivate; -typedef struct _GtkSourceCompletionClass GtkSourceCompletionClass; +#define GTK_SOURCE_COMPLETION_ERROR (gtk_source_completion_error_quark()) /** * GtkSourceCompletionError: @@ -68,40 +63,6 @@ typedef enum _GtkSourceCompletionError GTK_SOURCE_COMPLETION_ERROR_NOT_BOUND } GtkSourceCompletionError; -struct _GtkSourceCompletion -{ - GObject parent_instance; - - GtkSourceCompletionPrivate *priv; -}; - -struct _GtkSourceCompletionClass -{ - GObjectClass parent_class; - - gboolean (* proposal_activated) (GtkSourceCompletion *completion, - GtkSourceCompletionProvider *provider, - GtkSourceCompletionProposal *proposal); - void (* show) (GtkSourceCompletion *completion); - void (* hide) (GtkSourceCompletion *completion); - void (* populate_context) (GtkSourceCompletion *completion, - GtkSourceCompletionContext *context); - - /* Actions */ - void (* move_cursor) (GtkSourceCompletion *completion, - GtkScrollStep step, - gint num); - void (* move_page) (GtkSourceCompletion *completion, - GtkScrollStep step, - gint num); - void (* activate_proposal) (GtkSourceCompletion *completion); - - gpointer padding[20]; -}; - -GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_completion_get_type (void) G_GNUC_CONST; - GTK_SOURCE_AVAILABLE_IN_ALL GQuark gtk_source_completion_error_quark (void); -- GitLab From ef5acb3c9caafb498da599b6eea34774600d6341 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 16:58:52 -0800 Subject: [PATCH 009/248] completion: modernize GtkSourceCompletionContext Make the object final and move to G_DECLARE. --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcecompletioncontext.c | 69 ++++++++++------------ gtksourceview/gtksourcecompletioncontext.h | 59 +++++------------- 3 files changed, 47 insertions(+), 82 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 81f05d40..3a2460c6 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionInfo, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionItem, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFile, g_object_unref) diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c index f3616c4f..1a843727 100644 --- a/gtksourceview/gtksourcecompletioncontext.c +++ b/gtksourceview/gtksourcecompletioncontext.c @@ -66,8 +66,10 @@ #include "gtksourcecompletionprovider.h" #include "gtksourcecompletion.h" -struct _GtkSourceCompletionContextPrivate +struct _GtkSourceCompletionContext { + GInitiallyUnowned parent_instance; + GtkSourceCompletion *completion; GtkTextMark *mark; @@ -90,27 +92,26 @@ enum static guint context_signals[N_SIGNALS]; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceCompletionContext, gtk_source_completion_context, G_TYPE_INITIALLY_UNOWNED) +G_DEFINE_TYPE (GtkSourceCompletionContext, gtk_source_completion_context, G_TYPE_INITIALLY_UNOWNED) static void gtk_source_completion_context_dispose (GObject *object) { GtkSourceCompletionContext *context = GTK_SOURCE_COMPLETION_CONTEXT (object); - if (context->priv->mark != NULL) + if (context->mark != NULL) { - GtkTextBuffer *buffer = gtk_text_mark_get_buffer (context->priv->mark); + GtkTextBuffer *buffer = gtk_text_mark_get_buffer (context->mark); if (buffer != NULL) { - gtk_text_buffer_delete_mark (buffer, context->priv->mark); + gtk_text_buffer_delete_mark (buffer, context->mark); } - g_object_unref (context->priv->mark); - context->priv->mark = NULL; + g_clear_object (&context->mark); } - g_clear_object (&context->priv->completion); + g_clear_object (&context->completion); G_OBJECT_CLASS (gtk_source_completion_context_parent_class)->dispose (object); } @@ -123,27 +124,27 @@ set_iter (GtkSourceCompletionContext *context, buffer = gtk_text_iter_get_buffer (iter); - if (context->priv->mark != NULL) + if (context->mark != NULL) { GtkTextBuffer *old_buffer; - old_buffer = gtk_text_mark_get_buffer (context->priv->mark); + old_buffer = gtk_text_mark_get_buffer (context->mark); if (old_buffer != buffer) { - g_object_unref (context->priv->mark); - context->priv->mark = NULL; + g_object_unref (context->mark); + context->mark = NULL; } } - if (context->priv->mark == NULL) + if (context->mark == NULL) { - context->priv->mark = gtk_text_buffer_create_mark (buffer, NULL, iter, FALSE); - g_object_ref (context->priv->mark); + context->mark = gtk_text_buffer_create_mark (buffer, NULL, iter, FALSE); + g_object_ref (context->mark); } else { - gtk_text_buffer_move_mark (buffer, context->priv->mark, iter); + gtk_text_buffer_move_mark (buffer, context->mark, iter); } g_object_notify (G_OBJECT (context), "iter"); @@ -160,7 +161,7 @@ gtk_source_completion_context_set_property (GObject *object, switch (prop_id) { case PROP_COMPLETION: - context->priv->completion = g_value_dup_object (value); + context->completion = g_value_dup_object (value); break; case PROP_ITER: @@ -168,7 +169,7 @@ gtk_source_completion_context_set_property (GObject *object, break; case PROP_ACTIVATION: - context->priv->activation = g_value_get_flags (value); + context->activation = g_value_get_flags (value); break; default: @@ -187,7 +188,7 @@ gtk_source_completion_context_get_property (GObject *object, switch (prop_id) { case PROP_COMPLETION: - g_value_set_object (value, context->priv->completion); + g_value_set_object (value, context->completion); break; case PROP_ITER: @@ -202,7 +203,7 @@ gtk_source_completion_context_get_property (GObject *object, break; case PROP_ACTIVATION: - g_value_set_flags (value, context->priv->activation); + g_value_set_flags (value, context->activation); break; default: @@ -227,16 +228,10 @@ gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass * to know when to cancel running proposal queries. **/ context_signals[CANCELLED] = - g_signal_new ("cancelled", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkSourceCompletionContextClass, cancelled), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - g_signal_set_va_marshaller (context_signals[CANCELLED], - G_TYPE_FROM_CLASS (klass), - g_cclosure_marshal_VOID__VOIDv); + g_signal_new_class_handler ("cancelled", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + NULL, NULL, NULL, NULL, G_TYPE_NONE, 0); /** * GtkSourceCompletionContext:completion: @@ -287,7 +282,7 @@ gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass static void gtk_source_completion_context_init (GtkSourceCompletionContext *context) { - context->priv = gtk_source_completion_context_get_instance_private (context); + context = gtk_source_completion_context_get_instance_private (context); } /** @@ -313,7 +308,7 @@ gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *contex g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context)); g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider)); - _gtk_source_completion_add_proposals (context->priv->completion, + _gtk_source_completion_add_proposals (context->completion, context, provider, proposals, @@ -340,7 +335,7 @@ gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context), FALSE); - if (context->priv->mark == NULL) + if (context->mark == NULL) { /* This should never happen: context should be always be created providing a position iter */ @@ -348,14 +343,14 @@ gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, return FALSE; } - mark_buffer = gtk_text_mark_get_buffer (context->priv->mark); + mark_buffer = gtk_text_mark_get_buffer (context->mark); if (mark_buffer == NULL) { return FALSE; } - view = gtk_source_completion_get_view (context->priv->completion); + view = gtk_source_completion_get_view (context->completion); if (view == NULL) { return FALSE; @@ -368,7 +363,7 @@ gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, return FALSE; } - gtk_text_buffer_get_iter_at_mark (mark_buffer, iter, context->priv->mark); + gtk_text_buffer_get_iter_at_mark (mark_buffer, iter, context->mark); return TRUE; } @@ -386,7 +381,7 @@ gtk_source_completion_context_get_activation (GtkSourceCompletionContext *contex g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context), GTK_SOURCE_COMPLETION_ACTIVATION_NONE); - return context->priv->activation; + return context->activation; } void diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h index 72d07eac..da04f8b1 100644 --- a/gtksourceview/gtksourcecompletioncontext.h +++ b/gtksourceview/gtksourcecompletioncontext.h @@ -29,15 +29,10 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_COMPLETION_CONTEXT (gtk_source_completion_context_get_type ()) -#define GTK_SOURCE_COMPLETION_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContext)) -#define GTK_SOURCE_COMPLETION_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass)) -#define GTK_SOURCE_IS_COMPLETION_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT)) -#define GTK_SOURCE_IS_COMPLETION_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTEXT)) -#define GTK_SOURCE_COMPLETION_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass)) +#define GTK_SOURCE_TYPE_COMPLETION_CONTEXT (gtk_source_completion_context_get_type()) -typedef struct _GtkSourceCompletionContextClass GtkSourceCompletionContextClass; -typedef struct _GtkSourceCompletionContextPrivate GtkSourceCompletionContextPrivate; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_FINAL_TYPE (GtkSourceCompletionContext, gtk_source_completion_context, GTK_SOURCE, COMPLETION_CONTEXT, GInitiallyUnowned) /** * GtkSourceCompletionActivation: @@ -51,49 +46,25 @@ typedef struct _GtkSourceCompletionContextPrivate GtkSourceCompletionContextPriv */ typedef enum _GtkSourceCompletionActivation { - GTK_SOURCE_COMPLETION_ACTIVATION_NONE = 0, - GTK_SOURCE_COMPLETION_ACTIVATION_INTERACTIVE = 1 << 0, + GTK_SOURCE_COMPLETION_ACTIVATION_NONE = 0, + GTK_SOURCE_COMPLETION_ACTIVATION_INTERACTIVE = 1 << 0, GTK_SOURCE_COMPLETION_ACTIVATION_USER_REQUESTED = 1 << 1 } GtkSourceCompletionActivation; -struct _GtkSourceCompletionContext { - GInitiallyUnowned parent; - - GtkSourceCompletionContextPrivate *priv; -}; - -struct _GtkSourceCompletionContextClass { - GInitiallyUnownedClass parent_class; - - void (*cancelled) (GtkSourceCompletionContext *context); - - /* Padding for future expansion */ - gpointer padding[10]; -}; - GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_completion_context_get_type (void) G_GNUC_CONST; - -GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *context, - GtkSourceCompletionProvider *provider, - GList *proposals, - gboolean finished); - +void gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *context, + GtkSourceCompletionProvider *provider, + GList *proposals, + gboolean finished); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, - GtkTextIter *iter); - +gboolean gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, + GtkTextIter *iter); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceCompletionActivation - gtk_source_completion_context_get_activation (GtkSourceCompletionContext *context); - +GtkSourceCompletionActivation gtk_source_completion_context_get_activation (GtkSourceCompletionContext *context); G_GNUC_INTERNAL -GtkSourceCompletionContext * - _gtk_source_completion_context_new (GtkSourceCompletion *completion, - GtkTextIter *position); - +GtkSourceCompletionContext *_gtk_source_completion_context_new (GtkSourceCompletion *completion, + GtkTextIter *position); G_GNUC_INTERNAL -void _gtk_source_completion_context_cancel (GtkSourceCompletionContext *context); +void _gtk_source_completion_context_cancel (GtkSourceCompletionContext *context); G_END_DECLS -- GitLab From 9caa8d555593f95b95156781558cf66874202656 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 17:02:05 -0800 Subject: [PATCH 010/248] completion: modernize GtkSourceCompletionInfo Make final and switch to G_DECLARE_FINAL_TYPE() --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcecompletioninfo.c | 50 +++++++++++++------------ gtksourceview/gtksourcecompletioninfo.h | 42 ++++----------------- 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 3a2460c6..aa8070c3 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionInfo, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionItem, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFile, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileLoader, g_object_unref) diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c index 77f6582f..427008cc 100644 --- a/gtksourceview/gtksourcecompletioninfo.c +++ b/gtksourceview/gtksourcecompletioninfo.c @@ -60,8 +60,10 @@ #include "gtksourcecompletioninfo.h" #include -struct _GtkSourceCompletionInfoPrivate +struct _GtkSourceCompletionInfo { + GtkWindow parent_instance; + guint idle_resize; GtkWidget *attached_to; @@ -72,7 +74,7 @@ struct _GtkSourceCompletionInfoPrivate guint transient_set : 1; }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceCompletionInfo, gtk_source_completion_info, GTK_TYPE_WINDOW); +G_DEFINE_TYPE (GtkSourceCompletionInfo, gtk_source_completion_info, GTK_TYPE_WINDOW); /* Resize the window */ @@ -87,7 +89,7 @@ idle_resize (GtkSourceCompletionInfo *info) gint cur_window_width; gint cur_window_height; - info->priv->idle_resize = 0; + info->idle_resize = 0; if (child == NULL) { @@ -117,9 +119,9 @@ idle_resize (GtkSourceCompletionInfo *info) static void queue_resize (GtkSourceCompletionInfo *info) { - if (info->priv->idle_resize == 0) + if (info->idle_resize == 0) { - info->priv->idle_resize = g_idle_add ((GSourceFunc)idle_resize, info); + info->idle_resize = g_idle_add ((GSourceFunc)idle_resize, info); } } @@ -205,21 +207,21 @@ static void set_attached_to (GtkSourceCompletionInfo *info, GtkWidget *attached_to) { - if (info->priv->attached_to != NULL) + if (info->attached_to != NULL) { - g_object_remove_weak_pointer (G_OBJECT (info->priv->attached_to), - (gpointer *) &info->priv->attached_to); + g_object_remove_weak_pointer (G_OBJECT (info->attached_to), + (gpointer *) &info->attached_to); - if (info->priv->focus_out_event_handler != 0) + if (info->focus_out_event_handler != 0) { - g_signal_handler_disconnect (info->priv->attached_to, - info->priv->focus_out_event_handler); + g_signal_handler_disconnect (info->attached_to, + info->focus_out_event_handler); - info->priv->focus_out_event_handler = 0; + info->focus_out_event_handler = 0; } } - info->priv->attached_to = attached_to; + info->attached_to = attached_to; if (attached_to == NULL) { @@ -227,15 +229,15 @@ set_attached_to (GtkSourceCompletionInfo *info, } g_object_add_weak_pointer (G_OBJECT (attached_to), - (gpointer *) &info->priv->attached_to); + (gpointer *) &info->attached_to); - info->priv->focus_out_event_handler = + info->focus_out_event_handler = g_signal_connect_swapped (attached_to, "focus-out-event", G_CALLBACK (focus_out_event_cb), info); - info->priv->transient_set = FALSE; + info->transient_set = FALSE; } static void @@ -247,7 +249,7 @@ update_attached_to (GtkSourceCompletionInfo *info) static void gtk_source_completion_info_init (GtkSourceCompletionInfo *info) { - info->priv = gtk_source_completion_info_get_instance_private (info); + info = gtk_source_completion_info_get_instance_private (info); g_signal_connect (info, "notify::attached-to", @@ -271,10 +273,10 @@ gtk_source_completion_info_dispose (GObject *object) { GtkSourceCompletionInfo *info = GTK_SOURCE_COMPLETION_INFO (object); - if (info->priv->idle_resize != 0) + if (info->idle_resize != 0) { - g_source_remove (info->priv->idle_resize); - info->priv->idle_resize = 0; + g_source_remove (info->idle_resize); + info->idle_resize = 0; } set_attached_to (info, NULL); @@ -287,16 +289,16 @@ gtk_source_completion_info_show (GtkWidget *widget) { GtkSourceCompletionInfo *info = GTK_SOURCE_COMPLETION_INFO (widget); - if (info->priv->attached_to != NULL && !info->priv->transient_set) + if (info->attached_to != NULL && !info->transient_set) { GtkWidget *toplevel; - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (info->priv->attached_to)); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (info->attached_to)); if (gtk_widget_is_toplevel (toplevel)) { gtk_window_set_transient_for (GTK_WINDOW (info), GTK_WINDOW (toplevel)); - info->priv->transient_set = TRUE; + info->transient_set = TRUE; } } @@ -342,7 +344,7 @@ _gtk_source_completion_info_set_xoffset (GtkSourceCompletionInfo *window, { g_return_if_fail (GTK_SOURCE_IS_COMPLETION_INFO (window)); - window->priv->xoffset = xoffset; + window->xoffset = xoffset; } /* Move to iter */ diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h index 8c169f20..423dce7e 100644 --- a/gtksourceview/gtksourcecompletioninfo.h +++ b/gtksourceview/gtksourcecompletioninfo.h @@ -30,45 +30,19 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_COMPLETION_INFO (gtk_source_completion_info_get_type ()) -#define GTK_SOURCE_COMPLETION_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfo)) -#define GTK_SOURCE_COMPLETION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfoClass) -#define GTK_SOURCE_IS_COMPLETION_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_INFO)) -#define GTK_SOURCE_IS_COMPLETION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_INFO)) -#define GTK_SOURCE_COMPLETION_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfoClass)) - -typedef struct _GtkSourceCompletionInfoPrivate GtkSourceCompletionInfoPrivate; - -struct _GtkSourceCompletionInfo -{ - GtkWindow parent; - - GtkSourceCompletionInfoPrivate *priv; -}; - -typedef struct _GtkSourceCompletionInfoClass GtkSourceCompletionInfoClass; - -struct _GtkSourceCompletionInfoClass -{ - GtkWindowClass parent_class; - - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_COMPLETION_INFO (gtk_source_completion_info_get_type()) GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_completion_info_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceCompletionInfo, gtk_source_completion_info, GTK_SOURCE, COMPLETION_INFO, GtkWindow) GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceCompletionInfo * - gtk_source_completion_info_new (void); - +GtkSourceCompletionInfo *gtk_source_completion_info_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *info, - GtkTextView *view, - GtkTextIter *iter); - +void gtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *info, + GtkTextView *view, + GtkTextIter *iter); G_GNUC_INTERNAL -void _gtk_source_completion_info_set_xoffset (GtkSourceCompletionInfo *info, - gint xoffset); +void _gtk_source_completion_info_set_xoffset (GtkSourceCompletionInfo *info, + gint xoffset); G_END_DECLS -- GitLab From fa98139462aed6a3172adb3ad4b2a6799ab58b76 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 19:42:15 -0800 Subject: [PATCH 011/248] types: use spaces for alignment Always use spaces for alignment after characters. --- gtksourceview/gtksourcetypes.h | 64 +++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h index 7a24a537..0804f66e 100644 --- a/gtksourceview/gtksourcetypes.h +++ b/gtksourceview/gtksourcetypes.h @@ -34,37 +34,37 @@ G_BEGIN_DECLS * https://bugzilla.gnome.org/show_bug.cgi?id=679424#c20 */ -typedef struct _GtkSourceBuffer GtkSourceBuffer; -typedef struct _GtkSourceCompletionContext GtkSourceCompletionContext; -typedef struct _GtkSourceCompletion GtkSourceCompletion; -typedef struct _GtkSourceCompletionInfo GtkSourceCompletionInfo; -typedef struct _GtkSourceCompletionItem GtkSourceCompletionItem; -typedef struct _GtkSourceCompletionProposal GtkSourceCompletionProposal; -typedef struct _GtkSourceCompletionProvider GtkSourceCompletionProvider; -typedef struct _GtkSourceEncoding GtkSourceEncoding; -typedef struct _GtkSourceFile GtkSourceFile; -typedef struct _GtkSourceFileLoader GtkSourceFileLoader; -typedef struct _GtkSourceFileSaver GtkSourceFileSaver; -typedef struct _GtkSourceGutter GtkSourceGutter; -typedef struct _GtkSourceGutterRenderer GtkSourceGutterRenderer; -typedef struct _GtkSourceGutterRendererPixbuf GtkSourceGutterRendererPixbuf; -typedef struct _GtkSourceGutterRendererText GtkSourceGutterRendererText; -typedef struct _GtkSourceLanguage GtkSourceLanguage; -typedef struct _GtkSourceLanguageManager GtkSourceLanguageManager; -typedef struct _GtkSourceMap GtkSourceMap; -typedef struct _GtkSourceMarkAttributes GtkSourceMarkAttributes; -typedef struct _GtkSourceMark GtkSourceMark; -typedef struct _GtkSourcePrintCompositor GtkSourcePrintCompositor; -typedef struct _GtkSourceSearchContext GtkSourceSearchContext; -typedef struct _GtkSourceSearchSettings GtkSourceSearchSettings; -typedef struct _GtkSourceSpaceDrawer GtkSourceSpaceDrawer; -typedef struct _GtkSourceStyle GtkSourceStyle; -typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme; -typedef struct _GtkSourceStyleSchemeChooser GtkSourceStyleSchemeChooser; -typedef struct _GtkSourceStyleSchemeChooserButton GtkSourceStyleSchemeChooserButton; -typedef struct _GtkSourceStyleSchemeChooserWidget GtkSourceStyleSchemeChooserWidget; -typedef struct _GtkSourceStyleSchemeManager GtkSourceStyleSchemeManager; -typedef struct _GtkSourceUndoManager GtkSourceUndoManager; -typedef struct _GtkSourceView GtkSourceView; +typedef struct _GtkSourceBuffer GtkSourceBuffer; +typedef struct _GtkSourceCompletionContext GtkSourceCompletionContext; +typedef struct _GtkSourceCompletion GtkSourceCompletion; +typedef struct _GtkSourceCompletionInfo GtkSourceCompletionInfo; +typedef struct _GtkSourceCompletionItem GtkSourceCompletionItem; +typedef struct _GtkSourceCompletionProposal GtkSourceCompletionProposal; +typedef struct _GtkSourceCompletionProvider GtkSourceCompletionProvider; +typedef struct _GtkSourceEncoding GtkSourceEncoding; +typedef struct _GtkSourceFile GtkSourceFile; +typedef struct _GtkSourceFileLoader GtkSourceFileLoader; +typedef struct _GtkSourceFileSaver GtkSourceFileSaver; +typedef struct _GtkSourceGutter GtkSourceGutter; +typedef struct _GtkSourceGutterRenderer GtkSourceGutterRenderer; +typedef struct _GtkSourceGutterRendererPixbuf GtkSourceGutterRendererPixbuf; +typedef struct _GtkSourceGutterRendererText GtkSourceGutterRendererText; +typedef struct _GtkSourceLanguage GtkSourceLanguage; +typedef struct _GtkSourceLanguageManager GtkSourceLanguageManager; +typedef struct _GtkSourceMap GtkSourceMap; +typedef struct _GtkSourceMarkAttributes GtkSourceMarkAttributes; +typedef struct _GtkSourceMark GtkSourceMark; +typedef struct _GtkSourcePrintCompositor GtkSourcePrintCompositor; +typedef struct _GtkSourceSearchContext GtkSourceSearchContext; +typedef struct _GtkSourceSearchSettings GtkSourceSearchSettings; +typedef struct _GtkSourceSpaceDrawer GtkSourceSpaceDrawer; +typedef struct _GtkSourceStyle GtkSourceStyle; +typedef struct _GtkSourceStyleSchemeChooserButton GtkSourceStyleSchemeChooserButton; +typedef struct _GtkSourceStyleSchemeChooser GtkSourceStyleSchemeChooser; +typedef struct _GtkSourceStyleSchemeChooserWidget GtkSourceStyleSchemeChooserWidget; +typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme; +typedef struct _GtkSourceStyleSchemeManager GtkSourceStyleSchemeManager; +typedef struct _GtkSourceUndoManager GtkSourceUndoManager; +typedef struct _GtkSourceView GtkSourceView; G_END_DECLS -- GitLab From c68c59f5e4ab2ebd9a69579a3d311603f19fa0d6 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 19:43:11 -0800 Subject: [PATCH 012/248] completion: modernize GtkSourceCompletionItem Use G_DECLARE and other modernizations --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcecompletionitem.c | 169 ++++++++++++++---------- gtksourceview/gtksourcecompletionitem.h | 63 +++------ 3 files changed, 121 insertions(+), 112 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index aa8070c3..5e65f496 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceCompletionItem, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFile, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileLoader, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileSaver, g_object_unref) diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c index 0b4054d6..e81ae72c 100644 --- a/gtksourceview/gtksourcecompletionitem.c +++ b/gtksourceview/gtksourcecompletionitem.c @@ -33,7 +33,7 @@ #include "gtksourcecompletionitem.h" #include "gtksourcecompletionproposal.h" -struct _GtkSourceCompletionItemPrivate +typedef struct { gchar *label; gchar *markup; @@ -42,7 +42,7 @@ struct _GtkSourceCompletionItemPrivate gchar *icon_name; GIcon *gicon; gchar *info; -}; +} GtkSourceCompletionItemPrivate; enum { @@ -59,57 +59,78 @@ enum static void gtk_source_completion_proposal_iface_init (gpointer g_iface, gpointer iface_data); G_DEFINE_TYPE_WITH_CODE (GtkSourceCompletionItem, - gtk_source_completion_item, - G_TYPE_OBJECT, - G_ADD_PRIVATE (GtkSourceCompletionItem) - G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROPOSAL, - gtk_source_completion_proposal_iface_init)) + gtk_source_completion_item, + G_TYPE_OBJECT, + G_ADD_PRIVATE (GtkSourceCompletionItem) + G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROPOSAL, + gtk_source_completion_proposal_iface_init)) static gchar * gtk_source_completion_proposal_get_label_impl (GtkSourceCompletionProposal *proposal) { - return g_strdup (GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->label); + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return g_strdup (priv->label); } static gchar * gtk_source_completion_proposal_get_markup_impl (GtkSourceCompletionProposal *proposal) { - return g_strdup (GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->markup); + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return g_strdup (priv->markup); } static gchar * gtk_source_completion_proposal_get_text_impl (GtkSourceCompletionProposal *proposal) { - return g_strdup (GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->text); + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return g_strdup (priv->text); } static GdkPixbuf * gtk_source_completion_proposal_get_icon_impl (GtkSourceCompletionProposal *proposal) { - return GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->icon; + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return priv->icon; } static const gchar * gtk_source_completion_proposal_get_icon_name_impl (GtkSourceCompletionProposal *proposal) { - return GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->icon_name; + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return priv->icon_name; } static GIcon * gtk_source_completion_proposal_get_gicon_impl (GtkSourceCompletionProposal *proposal) { - return GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->gicon; + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return priv->gicon; } static gchar * gtk_source_completion_proposal_get_info_impl (GtkSourceCompletionProposal *proposal) { - return g_strdup (GTK_SOURCE_COMPLETION_ITEM (proposal)->priv->info); + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (proposal); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + + return g_strdup (priv->info); } static void gtk_source_completion_proposal_iface_init (gpointer g_iface, - gpointer iface_data) + gpointer iface_data) { GtkSourceCompletionProposalIface *iface = g_iface; @@ -127,9 +148,10 @@ static void gtk_source_completion_item_dispose (GObject *object) { GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (object); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); - g_clear_object (&item->priv->icon); - g_clear_object (&item->priv->gicon); + g_clear_object (&priv->icon); + g_clear_object (&priv->gicon); G_OBJECT_CLASS (gtk_source_completion_item_parent_class)->dispose (object); } @@ -138,56 +160,54 @@ static void gtk_source_completion_item_finalize (GObject *object) { GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (object); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); - g_free (item->priv->label); - g_free (item->priv->markup); - g_free (item->priv->text); - g_free (item->priv->icon_name); - g_free (item->priv->info); + g_free (priv->label); + g_free (priv->markup); + g_free (priv->text); + g_free (priv->icon_name); + g_free (priv->info); G_OBJECT_CLASS (gtk_source_completion_item_parent_class)->finalize (object); } static void gtk_source_completion_item_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { - GtkSourceCompletionItem *item; - - g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (object)); - - item = GTK_SOURCE_COMPLETION_ITEM (object); + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (object); + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); switch (prop_id) { case PROP_LABEL: - g_value_set_string (value, item->priv->label); + g_value_set_string (value, priv->label); break; case PROP_MARKUP: - g_value_set_string (value, item->priv->markup); + g_value_set_string (value, priv->markup); break; case PROP_TEXT: - g_value_set_string (value, item->priv->text); + g_value_set_string (value, priv->text); break; case PROP_ICON: - g_value_set_object (value, item->priv->icon); + g_value_set_object (value, priv->icon); break; case PROP_ICON_NAME: - g_value_set_string (value, item->priv->icon_name); + g_value_set_string (value, priv->icon_name); break; case PROP_GICON: - g_value_set_object (value, item->priv->gicon); + g_value_set_object (value, priv->gicon); break; case PROP_INFO: - g_value_set_string (value, item->priv->info); + g_value_set_string (value, priv->info); break; default: @@ -204,15 +224,11 @@ emit_changed (GtkSourceCompletionItem *item) static void gtk_source_completion_item_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { - GtkSourceCompletionItem *item; - - g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (object)); - - item = GTK_SOURCE_COMPLETION_ITEM (object); + GtkSourceCompletionItem *item = GTK_SOURCE_COMPLETION_ITEM (object); switch (prop_id) { @@ -366,7 +382,6 @@ gtk_source_completion_item_class_init (GtkSourceCompletionItemClass *klass) static void gtk_source_completion_item_init (GtkSourceCompletionItem *item) { - item->priv = gtk_source_completion_item_get_instance_private (item); } /** @@ -393,14 +408,16 @@ gtk_source_completion_item_new (void) */ void gtk_source_completion_item_set_label (GtkSourceCompletionItem *item, - const gchar *label) + const gchar *label) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); - if (g_strcmp0 (item->priv->label, label) != 0) + if (g_strcmp0 (priv->label, label) != 0) { - g_free (item->priv->label); - item->priv->label = g_strdup (label); + g_free (priv->label); + priv->label = g_strdup (label); emit_changed (item); g_object_notify (G_OBJECT (item), "label"); @@ -416,14 +433,16 @@ gtk_source_completion_item_set_label (GtkSourceCompletionItem *item, */ void gtk_source_completion_item_set_markup (GtkSourceCompletionItem *item, - const gchar *markup) + const gchar *markup) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); - if (g_strcmp0 (item->priv->markup, markup) != 0) + if (g_strcmp0 (priv->markup, markup) != 0) { - g_free (item->priv->markup); - item->priv->markup = g_strdup (markup); + g_free (priv->markup); + priv->markup = g_strdup (markup); emit_changed (item); g_object_notify (G_OBJECT (item), "markup"); @@ -439,14 +458,16 @@ gtk_source_completion_item_set_markup (GtkSourceCompletionItem *item, */ void gtk_source_completion_item_set_text (GtkSourceCompletionItem *item, - const gchar *text) + const gchar *text) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); - if (g_strcmp0 (item->priv->text, text) != 0) + if (g_strcmp0 (priv->text, text) != 0) { - g_free (item->priv->text); - item->priv->text = g_strdup (text); + g_free (priv->text); + priv->text = g_strdup (text); emit_changed (item); g_object_notify (G_OBJECT (item), "text"); @@ -462,12 +483,14 @@ gtk_source_completion_item_set_text (GtkSourceCompletionItem *item, */ void gtk_source_completion_item_set_icon (GtkSourceCompletionItem *item, - GdkPixbuf *icon) + GdkPixbuf *icon) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); g_return_if_fail (icon == NULL || GDK_IS_PIXBUF (icon)); - if (g_set_object (&item->priv->icon, icon)) + if (g_set_object (&priv->icon, icon)) { emit_changed (item); g_object_notify (G_OBJECT (item), "icon"); @@ -483,14 +506,16 @@ gtk_source_completion_item_set_icon (GtkSourceCompletionItem *item, */ void gtk_source_completion_item_set_icon_name (GtkSourceCompletionItem *item, - const gchar *icon_name) + const gchar *icon_name) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); - if (g_strcmp0 (item->priv->icon_name, icon_name) != 0) + if (g_strcmp0 (priv->icon_name, icon_name) != 0) { - g_free (item->priv->icon_name); - item->priv->icon_name = g_strdup (icon_name); + g_free (priv->icon_name); + priv->icon_name = g_strdup (icon_name); emit_changed (item); g_object_notify (G_OBJECT (item), "icon-name"); @@ -506,12 +531,14 @@ gtk_source_completion_item_set_icon_name (GtkSourceCompletionItem *item, */ void gtk_source_completion_item_set_gicon (GtkSourceCompletionItem *item, - GIcon *gicon) + GIcon *gicon) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); g_return_if_fail (gicon == NULL || G_IS_ICON (gicon)); - if (g_set_object (&item->priv->gicon, gicon)) + if (g_set_object (&priv->gicon, gicon)) { emit_changed (item); g_object_notify (G_OBJECT (item), "gicon"); @@ -527,14 +554,16 @@ gtk_source_completion_item_set_gicon (GtkSourceCompletionItem *item, */ void gtk_source_completion_item_set_info (GtkSourceCompletionItem *item, - const gchar *info) + const gchar *info) { + GtkSourceCompletionItemPrivate *priv = gtk_source_completion_item_get_instance_private (item); + g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (item)); - if (g_strcmp0 (item->priv->info, info) != 0) + if (g_strcmp0 (priv->info, info) != 0) { - g_free (item->priv->info); - item->priv->info = g_strdup (info); + g_free (priv->info); + priv->info = g_strdup (info); emit_changed (item); g_object_notify (G_OBJECT (item), "info"); diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h index 750786ef..6eeb465f 100644 --- a/gtksourceview/gtksourcecompletionitem.h +++ b/gtksourceview/gtksourcecompletionitem.h @@ -30,60 +30,41 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_COMPLETION_ITEM (gtk_source_completion_item_get_type ()) -#define GTK_SOURCE_COMPLETION_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItem)) -#define GTK_SOURCE_COMPLETION_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItemClass)) -#define GTK_SOURCE_IS_COMPLETION_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM)) -#define GTK_SOURCE_IS_COMPLETION_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_ITEM)) -#define GTK_SOURCE_COMPLETION_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItemClass)) +#define GTK_SOURCE_TYPE_COMPLETION_ITEM (gtk_source_completion_item_get_type()) -typedef struct _GtkSourceCompletionItemClass GtkSourceCompletionItemClass; -typedef struct _GtkSourceCompletionItemPrivate GtkSourceCompletionItemPrivate; - -struct _GtkSourceCompletionItem { - GObject parent; - - GtkSourceCompletionItemPrivate *priv; -}; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourceCompletionItem, gtk_source_completion_item, GTK_SOURCE, COMPLETION_ITEM, GObject) -struct _GtkSourceCompletionItemClass { +struct _GtkSourceCompletionItemClass +{ GObjectClass parent_class; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; -GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_completion_item_get_type (void) G_GNUC_CONST; - GTK_SOURCE_AVAILABLE_IN_4_0 -GtkSourceCompletionItem *gtk_source_completion_item_new (void); - +GtkSourceCompletionItem *gtk_source_completion_item_new (void); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_label (GtkSourceCompletionItem *item, - const gchar *label); - +void gtk_source_completion_item_set_label (GtkSourceCompletionItem *item, + const gchar *label); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_markup (GtkSourceCompletionItem *item, - const gchar *markup); - +void gtk_source_completion_item_set_markup (GtkSourceCompletionItem *item, + const gchar *markup); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_text (GtkSourceCompletionItem *item, - const gchar *text); - +void gtk_source_completion_item_set_text (GtkSourceCompletionItem *item, + const gchar *text); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_icon (GtkSourceCompletionItem *item, - GdkPixbuf *icon); - +void gtk_source_completion_item_set_icon (GtkSourceCompletionItem *item, + GdkPixbuf *icon); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_icon_name (GtkSourceCompletionItem *item, - const gchar *icon_name); - +void gtk_source_completion_item_set_icon_name (GtkSourceCompletionItem *item, + const gchar *icon_name); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_gicon (GtkSourceCompletionItem *item, - GIcon *gicon); - +void gtk_source_completion_item_set_gicon (GtkSourceCompletionItem *item, + GIcon *gicon); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_completion_item_set_info (GtkSourceCompletionItem *item, - const gchar *info); +void gtk_source_completion_item_set_info (GtkSourceCompletionItem *item, + const gchar *info); G_END_DECLS -- GitLab From eb8a7179ec3885bacb5be34519e24642f790246b Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 19:55:38 -0800 Subject: [PATCH 013/248] file: modernize GtkSourceFile - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcefile.c | 203 +++++++++++++++----------- gtksourceview/gtksourcefile.h | 112 +++++--------- 3 files changed, 156 insertions(+), 160 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 5e65f496..7141b7aa 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFile, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileLoader, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileSaver, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutter, g_object_unref) diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c index 717f7138..3d41c4b0 100644 --- a/gtksourceview/gtksourcefile.c +++ b/gtksourceview/gtksourcefile.c @@ -55,7 +55,7 @@ enum PROP_READ_ONLY }; -struct _GtkSourceFilePrivate +typedef struct { GFile *location; const GtkSourceEncoding *encoding; @@ -76,42 +76,39 @@ struct _GtkSourceFilePrivate guint externally_modified : 1; guint deleted : 1; guint readonly : 1; -}; +} GtkSourceFilePrivate; G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceFile, gtk_source_file, G_TYPE_OBJECT) static void gtk_source_file_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { - GtkSourceFile *file; - - g_return_if_fail (GTK_SOURCE_IS_FILE (object)); - - file = GTK_SOURCE_FILE (object); + GtkSourceFile *file = GTK_SOURCE_FILE (object); + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); switch (prop_id) { case PROP_LOCATION: - g_value_set_object (value, file->priv->location); + g_value_set_object (value, priv->location); break; case PROP_ENCODING: - g_value_set_boxed (value, file->priv->encoding); + g_value_set_boxed (value, priv->encoding); break; case PROP_NEWLINE_TYPE: - g_value_set_enum (value, file->priv->newline_type); + g_value_set_enum (value, priv->newline_type); break; case PROP_COMPRESSION_TYPE: - g_value_set_enum (value, file->priv->compression_type); + g_value_set_enum (value, priv->compression_type); break; case PROP_READ_ONLY: - g_value_set_boolean (value, file->priv->readonly); + g_value_set_boolean (value, priv->readonly); break; default: @@ -122,15 +119,11 @@ gtk_source_file_get_property (GObject *object, static void gtk_source_file_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { - GtkSourceFile *file; - - g_return_if_fail (GTK_SOURCE_IS_FILE (object)); - - file = GTK_SOURCE_FILE (object); + GtkSourceFile *file = GTK_SOURCE_FILE (object); switch (prop_id) { @@ -148,13 +141,14 @@ static void gtk_source_file_dispose (GObject *object) { GtkSourceFile *file = GTK_SOURCE_FILE (object); + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); - g_clear_object (&file->priv->location); + g_clear_object (&priv->location); - if (file->priv->mount_operation_notify != NULL) + if (priv->mount_operation_notify != NULL) { - file->priv->mount_operation_notify (file->priv->mount_operation_userdata); - file->priv->mount_operation_notify = NULL; + priv->mount_operation_notify (priv->mount_operation_userdata); + priv->mount_operation_notify = NULL; } G_OBJECT_CLASS (gtk_source_file_parent_class)->dispose (object); @@ -258,11 +252,11 @@ gtk_source_file_class_init (GtkSourceFileClass *klass) static void gtk_source_file_init (GtkSourceFile *file) { - file->priv = gtk_source_file_get_instance_private (file); + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); - file->priv->encoding = NULL; - file->priv->newline_type = GTK_SOURCE_NEWLINE_TYPE_LF; - file->priv->compression_type = GTK_SOURCE_COMPRESSION_TYPE_NONE; + priv->encoding = NULL; + priv->newline_type = GTK_SOURCE_NEWLINE_TYPE_LF; + priv->compression_type = GTK_SOURCE_COMPRESSION_TYPE_NONE; } /** @@ -288,20 +282,22 @@ gtk_source_file_new (void) */ void gtk_source_file_set_location (GtkSourceFile *file, - GFile *location) + GFile *location) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); g_return_if_fail (location == NULL || G_IS_FILE (location)); - if (g_set_object (&file->priv->location, location)) + if (g_set_object (&priv->location, location)) { g_object_notify (G_OBJECT (file), "location"); /* The modification_time is for the old location. */ - file->priv->modification_time_set = FALSE; + priv->modification_time_set = FALSE; - file->priv->externally_modified = FALSE; - file->priv->deleted = FALSE; + priv->externally_modified = FALSE; + priv->deleted = FALSE; } } @@ -315,20 +311,24 @@ gtk_source_file_set_location (GtkSourceFile *file, GFile * gtk_source_file_get_location (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), NULL); - return file->priv->location; + return priv->location; } void _gtk_source_file_set_encoding (GtkSourceFile *file, - const GtkSourceEncoding *encoding) + const GtkSourceEncoding *encoding) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - if (file->priv->encoding != encoding) + if (priv->encoding != encoding) { - file->priv->encoding = encoding; + priv->encoding = encoding; g_object_notify (G_OBJECT (file), "encoding"); } } @@ -346,20 +346,24 @@ _gtk_source_file_set_encoding (GtkSourceFile *file, const GtkSourceEncoding * gtk_source_file_get_encoding (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), NULL); - return file->priv->encoding; + return priv->encoding; } void _gtk_source_file_set_newline_type (GtkSourceFile *file, - GtkSourceNewlineType newline_type) + GtkSourceNewlineType newline_type) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - if (file->priv->newline_type != newline_type) + if (priv->newline_type != newline_type) { - file->priv->newline_type = newline_type; + priv->newline_type = newline_type; g_object_notify (G_OBJECT (file), "newline-type"); } } @@ -374,20 +378,24 @@ _gtk_source_file_set_newline_type (GtkSourceFile *file, GtkSourceNewlineType gtk_source_file_get_newline_type (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), GTK_SOURCE_NEWLINE_TYPE_DEFAULT); - return file->priv->newline_type; + return priv->newline_type; } void _gtk_source_file_set_compression_type (GtkSourceFile *file, - GtkSourceCompressionType compression_type) + GtkSourceCompressionType compression_type) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - if (file->priv->compression_type != compression_type) + if (priv->compression_type != compression_type) { - file->priv->compression_type = compression_type; + priv->compression_type = compression_type; g_object_notify (G_OBJECT (file), "compression-type"); } } @@ -402,9 +410,11 @@ _gtk_source_file_set_compression_type (GtkSourceFile *file, GtkSourceCompressionType gtk_source_file_get_compression_type (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), GTK_SOURCE_COMPRESSION_TYPE_NONE); - return file->priv->compression_type; + return priv->compression_type; } /** @@ -427,34 +437,40 @@ gtk_source_file_get_compression_type (GtkSourceFile *file) */ void gtk_source_file_set_mount_operation_factory (GtkSourceFile *file, - GtkSourceMountOperationFactory callback, - gpointer user_data, - GDestroyNotify notify) + GtkSourceMountOperationFactory callback, + gpointer user_data, + GDestroyNotify notify) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - if (file->priv->mount_operation_notify != NULL) + if (priv->mount_operation_notify != NULL) { - file->priv->mount_operation_notify (file->priv->mount_operation_userdata); + priv->mount_operation_notify (priv->mount_operation_userdata); } - file->priv->mount_operation_factory = callback; - file->priv->mount_operation_userdata = user_data; - file->priv->mount_operation_notify = notify; + priv->mount_operation_factory = callback; + priv->mount_operation_userdata = user_data; + priv->mount_operation_notify = notify; } GMountOperation * _gtk_source_file_create_mount_operation (GtkSourceFile *file) { - return (file != NULL && file->priv->mount_operation_factory != NULL) ? - file->priv->mount_operation_factory (file, file->priv->mount_operation_userdata) : + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + + return (file != NULL && priv->mount_operation_factory != NULL) ? + priv->mount_operation_factory (file, priv->mount_operation_userdata) : g_mount_operation_new (); } gboolean _gtk_source_file_get_modification_time (GtkSourceFile *file, - GTimeVal *modification_time) + GTimeVal *modification_time) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_assert (modification_time != NULL); if (file == NULL) @@ -464,24 +480,26 @@ _gtk_source_file_get_modification_time (GtkSourceFile *file, g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), FALSE); - if (file->priv->modification_time_set) + if (priv->modification_time_set) { - *modification_time = file->priv->modification_time; + *modification_time = priv->modification_time; } - return file->priv->modification_time_set; + return priv->modification_time_set; } void _gtk_source_file_set_modification_time (GtkSourceFile *file, - GTimeVal modification_time) + GTimeVal modification_time) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + if (file != NULL) { g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - file->priv->modification_time = modification_time; - file->priv->modification_time_set = TRUE; + priv->modification_time = modification_time; + priv->modification_time_set = TRUE; } } @@ -498,14 +516,16 @@ _gtk_source_file_set_modification_time (GtkSourceFile *file, gboolean gtk_source_file_is_local (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), FALSE); - if (file->priv->location == NULL) + if (priv->location == NULL) { return FALSE; } - return g_file_has_uri_scheme (file->priv->location, "file"); + return g_file_has_uri_scheme (priv->location, "file"); } /** @@ -527,14 +547,15 @@ gtk_source_file_is_local (GtkSourceFile *file) void gtk_source_file_check_file_on_disk (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); GFileInfo *info; - if (file->priv->location == NULL) + if (priv->location == NULL) { return; } - info = g_file_query_info (file->priv->location, + info = g_file_query_info (priv->location, G_FILE_ATTRIBUTE_TIME_MODIFIED "," G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, @@ -543,12 +564,12 @@ gtk_source_file_check_file_on_disk (GtkSourceFile *file) if (info == NULL) { - file->priv->deleted = TRUE; + priv->deleted = TRUE; return; } if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED) && - file->priv->modification_time_set) + priv->modification_time_set) { GTimeVal timeval; @@ -557,10 +578,10 @@ gtk_source_file_check_file_on_disk (GtkSourceFile *file) /* Note that the modification time can even go backwards if the * user is copying over an old file. */ - if (timeval.tv_sec != file->priv->modification_time.tv_sec || - timeval.tv_usec != file->priv->modification_time.tv_usec) + if (timeval.tv_sec != priv->modification_time.tv_sec || + timeval.tv_usec != priv->modification_time.tv_usec) { - file->priv->externally_modified = TRUE; + priv->externally_modified = TRUE; } } @@ -578,11 +599,13 @@ gtk_source_file_check_file_on_disk (GtkSourceFile *file) void _gtk_source_file_set_externally_modified (GtkSourceFile *file, - gboolean externally_modified) + gboolean externally_modified) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - file->priv->externally_modified = externally_modified != FALSE; + priv->externally_modified = externally_modified != FALSE; } /** @@ -601,18 +624,22 @@ _gtk_source_file_set_externally_modified (GtkSourceFile *file, gboolean gtk_source_file_is_externally_modified (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), FALSE); - return file->priv->externally_modified; + return priv->externally_modified; } void _gtk_source_file_set_deleted (GtkSourceFile *file, - gboolean deleted) + gboolean deleted) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); - file->priv->deleted = deleted != FALSE; + priv->deleted = deleted != FALSE; } /** @@ -631,22 +658,26 @@ _gtk_source_file_set_deleted (GtkSourceFile *file, gboolean gtk_source_file_is_deleted (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), FALSE); - return file->priv->deleted; + return priv->deleted; } void _gtk_source_file_set_readonly (GtkSourceFile *file, - gboolean readonly) + gboolean readonly) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_if_fail (GTK_SOURCE_IS_FILE (file)); readonly = readonly != FALSE; - if (file->priv->readonly != readonly) + if (priv->readonly != readonly) { - file->priv->readonly = readonly; + priv->readonly = readonly; g_object_notify (G_OBJECT (file), "read-only"); } } @@ -667,7 +698,9 @@ _gtk_source_file_set_readonly (GtkSourceFile *file, gboolean gtk_source_file_is_readonly (GtkSourceFile *file) { + GtkSourceFilePrivate *priv = gtk_source_file_get_instance_private (file); + g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), FALSE); - return file->priv->readonly; + return priv->readonly; } diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h index e4d1bbb1..d81b65fc 100644 --- a/gtksourceview/gtksourcefile.h +++ b/gtksourceview/gtksourcefile.h @@ -29,15 +29,7 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_FILE (gtk_source_file_get_type ()) -#define GTK_SOURCE_FILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_FILE, GtkSourceFile)) -#define GTK_SOURCE_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_FILE, GtkSourceFileClass)) -#define GTK_SOURCE_IS_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_FILE)) -#define GTK_SOURCE_IS_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_FILE)) -#define GTK_SOURCE_FILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_FILE, GtkSourceFileClass)) - -typedef struct _GtkSourceFileClass GtkSourceFileClass; -typedef struct _GtkSourceFilePrivate GtkSourceFilePrivate; +#define GTK_SOURCE_TYPE_FILE (gtk_source_file_get_type()) /** * GtkSourceNewlineType: @@ -94,101 +86,73 @@ typedef enum _GtkSourceCompressionType typedef GMountOperation *(*GtkSourceMountOperationFactory) (GtkSourceFile *file, gpointer userdata); -struct _GtkSourceFile -{ - GObject parent; - - GtkSourceFilePrivate *priv; -}; +GTK_SOURCE_AVAILABLE_IN_3_14 +G_DECLARE_DERIVABLE_TYPE (GtkSourceFile, gtk_source_file, GTK_SOURCE, FILE, GObject) struct _GtkSourceFileClass { GObjectClass parent_class; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; -GTK_SOURCE_AVAILABLE_IN_3_14 -GType gtk_source_file_get_type (void) G_GNUC_CONST; GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFile *gtk_source_file_new (void); - +GtkSourceFile *gtk_source_file_new (void); GTK_SOURCE_AVAILABLE_IN_3_14 -GFile *gtk_source_file_get_location (GtkSourceFile *file); - +GFile *gtk_source_file_get_location (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_set_location (GtkSourceFile *file, - GFile *location); - +void gtk_source_file_set_location (GtkSourceFile *file, + GFile *location); GTK_SOURCE_AVAILABLE_IN_3_14 -const GtkSourceEncoding * - gtk_source_file_get_encoding (GtkSourceFile *file); - +const GtkSourceEncoding *gtk_source_file_get_encoding (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceNewlineType - gtk_source_file_get_newline_type (GtkSourceFile *file); - +GtkSourceNewlineType gtk_source_file_get_newline_type (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceCompressionType - gtk_source_file_get_compression_type (GtkSourceFile *file); - +GtkSourceCompressionType gtk_source_file_get_compression_type (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_set_mount_operation_factory (GtkSourceFile *file, - GtkSourceMountOperationFactory callback, - gpointer user_data, - GDestroyNotify notify); - +void gtk_source_file_set_mount_operation_factory (GtkSourceFile *file, + GtkSourceMountOperationFactory callback, + gpointer user_data, + GDestroyNotify notify); GTK_SOURCE_AVAILABLE_IN_3_18 -void gtk_source_file_check_file_on_disk (GtkSourceFile *file); - +void gtk_source_file_check_file_on_disk (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_18 -gboolean gtk_source_file_is_local (GtkSourceFile *file); - +gboolean gtk_source_file_is_local (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_18 -gboolean gtk_source_file_is_externally_modified (GtkSourceFile *file); - +gboolean gtk_source_file_is_externally_modified (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_18 -gboolean gtk_source_file_is_deleted (GtkSourceFile *file); - +gboolean gtk_source_file_is_deleted (GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_18 -gboolean gtk_source_file_is_readonly (GtkSourceFile *file); - +gboolean gtk_source_file_is_readonly (GtkSourceFile *file); G_GNUC_INTERNAL -void _gtk_source_file_set_encoding (GtkSourceFile *file, - const GtkSourceEncoding *encoding); - +void _gtk_source_file_set_encoding (GtkSourceFile *file, + const GtkSourceEncoding *encoding); G_GNUC_INTERNAL -void _gtk_source_file_set_newline_type (GtkSourceFile *file, - GtkSourceNewlineType newline_type); - +void _gtk_source_file_set_newline_type (GtkSourceFile *file, + GtkSourceNewlineType newline_type); G_GNUC_INTERNAL -void _gtk_source_file_set_compression_type (GtkSourceFile *file, - GtkSourceCompressionType compression_type); - +void _gtk_source_file_set_compression_type (GtkSourceFile *file, + GtkSourceCompressionType compression_type); G_GNUC_INTERNAL -GMountOperation *_gtk_source_file_create_mount_operation (GtkSourceFile *file); - +GMountOperation *_gtk_source_file_create_mount_operation (GtkSourceFile *file); G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_INTERNAL -gboolean _gtk_source_file_get_modification_time (GtkSourceFile *file, - GTimeVal *modification_time); - +gboolean _gtk_source_file_get_modification_time (GtkSourceFile *file, + GTimeVal *modification_time); G_GNUC_INTERNAL -void _gtk_source_file_set_modification_time (GtkSourceFile *file, - GTimeVal modification_time); +void _gtk_source_file_set_modification_time (GtkSourceFile *file, + GTimeVal modification_time); G_GNUC_END_IGNORE_DEPRECATIONS - G_GNUC_INTERNAL -void _gtk_source_file_set_externally_modified (GtkSourceFile *file, - gboolean externally_modified); - +void _gtk_source_file_set_externally_modified (GtkSourceFile *file, + gboolean externally_modified); G_GNUC_INTERNAL -void _gtk_source_file_set_deleted (GtkSourceFile *file, - gboolean deleted); - +void _gtk_source_file_set_deleted (GtkSourceFile *file, + gboolean deleted); G_GNUC_INTERNAL -void _gtk_source_file_set_readonly (GtkSourceFile *file, - gboolean readonly); +void _gtk_source_file_set_readonly (GtkSourceFile *file, + gboolean readonly); G_END_DECLS -- GitLab From 07f33c3f17326f60d70dee83bf000b91b12f8d54 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 20:03:57 -0800 Subject: [PATCH 014/248] file: modernize GtkSourceFileLoader - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcefileloader.c | 251 +++++++++++++------------- gtksourceview/gtksourcefileloader.h | 96 +++------- 3 files changed, 155 insertions(+), 193 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 7141b7aa..2ed4003b 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileLoader, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileSaver, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutter, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRenderer, g_object_unref) diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c index 54e446be..09b329a3 100644 --- a/gtksourceview/gtksourcefileloader.c +++ b/gtksourceview/gtksourcefileloader.c @@ -87,8 +87,10 @@ enum G_FILE_ATTRIBUTE_STANDARD_SIZE "," \ G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE -struct _GtkSourceFileLoaderPrivate +struct _GtkSourceFileLoader { + GObject parent_instance; + /* Weak ref to the GtkSourceBuffer. A strong ref could create a * reference cycle in an application. For example a subclass of * GtkSourceBuffer can have a strong ref to the FileLoader. @@ -117,8 +119,7 @@ struct _GtkSourceFileLoaderPrivate GTask *task; }; -typedef struct _TaskData TaskData; -struct _TaskData +typedef struct { /* The two streams cannot be spliced directly, because: * (1) We need to call the progress callback. @@ -142,11 +143,11 @@ struct _TaskData guint guess_content_type_from_content : 1; guint tried_mount : 1; -}; +} TaskData; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceFileLoader, gtk_source_file_loader, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkSourceFileLoader, gtk_source_file_loader, G_TYPE_OBJECT) -static void open_file (GTask *task); +static void open_file (GTask *task); static void read_file_chunk (GTask *task); static TaskData * @@ -195,36 +196,36 @@ get_compression_type_from_content_type (const gchar *content_type) static void gtk_source_file_loader_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceFileLoader *loader = GTK_SOURCE_FILE_LOADER (object); switch (prop_id) { case PROP_BUFFER: - g_assert (loader->priv->source_buffer == NULL); - loader->priv->source_buffer = g_value_get_object (value); - g_object_add_weak_pointer (G_OBJECT (loader->priv->source_buffer), - (gpointer *)&loader->priv->source_buffer); + g_assert (loader->source_buffer == NULL); + loader->source_buffer = g_value_get_object (value); + g_object_add_weak_pointer (G_OBJECT (loader->source_buffer), + (gpointer *)&loader->source_buffer); break; case PROP_FILE: - g_assert (loader->priv->file == NULL); - loader->priv->file = g_value_get_object (value); - g_object_add_weak_pointer (G_OBJECT (loader->priv->file), - (gpointer *)&loader->priv->file); + g_assert (loader->file == NULL); + loader->file = g_value_get_object (value); + g_object_add_weak_pointer (G_OBJECT (loader->file), + (gpointer *)&loader->file); break; case PROP_LOCATION: - g_assert (loader->priv->location == NULL); - loader->priv->location = g_value_dup_object (value); + g_assert (loader->location == NULL); + loader->location = g_value_dup_object (value); break; case PROP_INPUT_STREAM: - g_assert (loader->priv->input_stream_property == NULL); - loader->priv->input_stream_property = g_value_dup_object (value); + g_assert (loader->input_stream_property == NULL); + loader->input_stream_property = g_value_dup_object (value); break; default: @@ -235,28 +236,28 @@ gtk_source_file_loader_set_property (GObject *object, static void gtk_source_file_loader_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceFileLoader *loader = GTK_SOURCE_FILE_LOADER (object); switch (prop_id) { case PROP_BUFFER: - g_value_set_object (value, loader->priv->source_buffer); + g_value_set_object (value, loader->source_buffer); break; case PROP_FILE: - g_value_set_object (value, loader->priv->file); + g_value_set_object (value, loader->file); break; case PROP_LOCATION: - g_value_set_object (value, loader->priv->location); + g_value_set_object (value, loader->location); break; case PROP_INPUT_STREAM: - g_value_set_object (value, loader->priv->input_stream_property); + g_value_set_object (value, loader->input_stream_property); break; default: @@ -270,28 +271,28 @@ gtk_source_file_loader_dispose (GObject *object) { GtkSourceFileLoader *loader = GTK_SOURCE_FILE_LOADER (object); - if (loader->priv->source_buffer != NULL) + if (loader->source_buffer != NULL) { - g_object_remove_weak_pointer (G_OBJECT (loader->priv->source_buffer), - (gpointer *)&loader->priv->source_buffer); + g_object_remove_weak_pointer (G_OBJECT (loader->source_buffer), + (gpointer *)&loader->source_buffer); - loader->priv->source_buffer = NULL; + loader->source_buffer = NULL; } - if (loader->priv->file != NULL) + if (loader->file != NULL) { - g_object_remove_weak_pointer (G_OBJECT (loader->priv->file), - (gpointer *)&loader->priv->file); + g_object_remove_weak_pointer (G_OBJECT (loader->file), + (gpointer *)&loader->file); - loader->priv->file = NULL; + loader->file = NULL; } - g_clear_object (&loader->priv->location); - g_clear_object (&loader->priv->input_stream_property); - g_clear_object (&loader->priv->task); + g_clear_object (&loader->location); + g_clear_object (&loader->input_stream_property); + g_clear_object (&loader->task); - g_slist_free (loader->priv->candidate_encodings); - loader->priv->candidate_encodings = NULL; + g_slist_free (loader->candidate_encodings); + loader->candidate_encodings = NULL; G_OBJECT_CLASS (gtk_source_file_loader_parent_class)->dispose (object); } @@ -309,12 +310,12 @@ set_default_candidate_encodings (GtkSourceFileLoader *loader) */ list = gtk_source_encoding_get_default_candidates (); - if (loader->priv->file == NULL) + if (loader->file == NULL) { goto end; } - file_encoding = gtk_source_file_get_encoding (loader->priv->file); + file_encoding = gtk_source_file_get_encoding (loader->file); if (file_encoding == NULL) { @@ -340,8 +341,8 @@ set_default_candidate_encodings (GtkSourceFileLoader *loader) list = g_slist_prepend (list, (gpointer) file_encoding); end: - g_slist_free (loader->priv->candidate_encodings); - loader->priv->candidate_encodings = list; + g_slist_free (loader->candidate_encodings); + loader->candidate_encodings = list; } static void @@ -349,18 +350,18 @@ gtk_source_file_loader_constructed (GObject *object) { GtkSourceFileLoader *loader = GTK_SOURCE_FILE_LOADER (object); - if (loader->priv->file != NULL) + if (loader->file != NULL) { set_default_candidate_encodings (loader); - if (loader->priv->location == NULL && - loader->priv->input_stream_property == NULL) + if (loader->location == NULL && + loader->input_stream_property == NULL) { - loader->priv->location = gtk_source_file_get_location (loader->priv->file); + loader->location = gtk_source_file_get_location (loader->file); - if (loader->priv->location != NULL) + if (loader->location != NULL) { - g_object_ref (loader->priv->location); + g_object_ref (loader->location); } else { @@ -464,13 +465,13 @@ gtk_source_file_loader_class_init (GtkSourceFileLoaderClass *klass) static void gtk_source_file_loader_init (GtkSourceFileLoader *loader) { - loader->priv = gtk_source_file_loader_get_instance_private (loader); + loader = gtk_source_file_loader_get_instance_private (loader); } static void close_input_stream_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GInputStream *input_stream = G_INPUT_STREAM (source_object); GTask *task = G_TASK (user_data); @@ -594,8 +595,8 @@ write_file_chunk (GTask *task) static void read_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GInputStream *input_stream = G_INPUT_STREAM (source_object); GTask *task = G_TASK (user_data); @@ -655,10 +656,10 @@ read_cb (GObject *source_object, /* Flush the stream to ensure proper line ending detection. */ g_output_stream_flush (G_OUTPUT_STREAM (task_data->output_stream), NULL, NULL); - loader->priv->auto_detected_encoding = + loader->auto_detected_encoding = gtk_source_buffer_output_stream_get_guessed (task_data->output_stream); - loader->priv->auto_detected_newline_type = + loader->auto_detected_newline_type = gtk_source_buffer_output_stream_detect_newline_type (task_data->output_stream); write_complete (task); @@ -715,11 +716,11 @@ create_input_stream (GTask *task) loader = g_task_get_source_object (task); task_data = g_task_get_task_data (task); - loader->priv->auto_detected_compression_type = GTK_SOURCE_COMPRESSION_TYPE_NONE; + loader->auto_detected_compression_type = GTK_SOURCE_COMPRESSION_TYPE_NONE; - if (loader->priv->input_stream_property != NULL) + if (loader->input_stream_property != NULL) { - task_data->input_stream = g_object_ref (loader->priv->input_stream_property); + task_data->input_stream = g_object_ref (loader->input_stream_property); } else if (g_file_info_has_attribute (task_data->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE)) { @@ -729,7 +730,7 @@ create_input_stream (GTask *task) { case GTK_SOURCE_COMPRESSION_TYPE_GZIP: add_gzip_decompressor_stream (task); - loader->priv->auto_detected_compression_type = GTK_SOURCE_COMPRESSION_TYPE_GZIP; + loader->auto_detected_compression_type = GTK_SOURCE_COMPRESSION_TYPE_GZIP; break; case GTK_SOURCE_COMPRESSION_TYPE_NONE: @@ -749,8 +750,8 @@ create_input_stream (GTask *task) static void query_info_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -793,8 +794,8 @@ query_info_cb (GObject *source_object, static void mount_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -827,7 +828,7 @@ recover_not_mounted (GTask *task) loader = g_task_get_source_object (task); task_data = g_task_get_task_data (task); - mount_operation = _gtk_source_file_create_mount_operation (loader->priv->file); + mount_operation = _gtk_source_file_create_mount_operation (loader->file); DEBUG ({ g_print ("%s\n", G_STRFUNC); @@ -835,7 +836,7 @@ recover_not_mounted (GTask *task) task_data->tried_mount = TRUE; - g_file_mount_enclosing_volume (loader->priv->location, + g_file_mount_enclosing_volume (loader->location, G_MOUNT_MOUNT_NONE, mount_operation, g_task_get_cancellable (task), @@ -847,8 +848,8 @@ recover_not_mounted (GTask *task) static void open_file_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -900,7 +901,7 @@ open_file (GTask *task) loader = g_task_get_source_object (task); - g_file_read_async (loader->priv->location, + g_file_read_async (loader->location, g_task_get_priority (task), g_task_get_cancellable (task), open_file_cb, @@ -936,7 +937,7 @@ gtk_source_file_loader_error_quark (void) */ GtkSourceFileLoader * gtk_source_file_loader_new (GtkSourceBuffer *buffer, - GtkSourceFile *file) + GtkSourceFile *file) { g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), NULL); @@ -960,8 +961,8 @@ gtk_source_file_loader_new (GtkSourceBuffer *buffer, */ GtkSourceFileLoader * gtk_source_file_loader_new_from_stream (GtkSourceBuffer *buffer, - GtkSourceFile *file, - GInputStream *stream) + GtkSourceFile *file, + GInputStream *stream) { g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), NULL); @@ -996,18 +997,18 @@ gtk_source_file_loader_new_from_stream (GtkSourceBuffer *buffer, */ void gtk_source_file_loader_set_candidate_encodings (GtkSourceFileLoader *loader, - GSList *candidate_encodings) + GSList *candidate_encodings) { GSList *list; g_return_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader)); - g_return_if_fail (loader->priv->task == NULL); + g_return_if_fail (loader->task == NULL); list = g_slist_copy (candidate_encodings); list = _gtk_source_encoding_remove_duplicates (list, GTK_SOURCE_ENCODING_DUPLICATES_KEEP_FIRST); - g_slist_free (loader->priv->candidate_encodings); - loader->priv->candidate_encodings = list; + g_slist_free (loader->candidate_encodings); + loader->candidate_encodings = list; } /** @@ -1022,7 +1023,7 @@ gtk_source_file_loader_get_buffer (GtkSourceFileLoader *loader) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), NULL); - return loader->priv->source_buffer; + return loader->source_buffer; } /** @@ -1037,7 +1038,7 @@ gtk_source_file_loader_get_file (GtkSourceFileLoader *loader) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), NULL); - return loader->priv->file; + return loader->file; } /** @@ -1053,7 +1054,7 @@ gtk_source_file_loader_get_location (GtkSourceFileLoader *loader) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), NULL); - return loader->priv->location; + return loader->location; } /** @@ -1069,7 +1070,7 @@ gtk_source_file_loader_get_input_stream (GtkSourceFileLoader *loader) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), NULL); - return loader->priv->input_stream_property; + return loader->input_stream_property; } /** @@ -1100,36 +1101,36 @@ gtk_source_file_loader_get_input_stream (GtkSourceFileLoader *loader) */ void gtk_source_file_loader_load_async (GtkSourceFileLoader *loader, - gint io_priority, - GCancellable *cancellable, - GFileProgressCallback progress_callback, - gpointer progress_callback_data, - GDestroyNotify progress_callback_notify, - GAsyncReadyCallback callback, - gpointer user_data) + gint io_priority, + GCancellable *cancellable, + GFileProgressCallback progress_callback, + gpointer progress_callback_data, + GDestroyNotify progress_callback_notify, + GAsyncReadyCallback callback, + gpointer user_data) { TaskData *task_data; gboolean implicit_trailing_newline; g_return_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (loader->priv->task == NULL); + g_return_if_fail (loader->task == NULL); - loader->priv->task = g_task_new (loader, cancellable, callback, user_data); - g_task_set_priority (loader->priv->task, io_priority); + loader->task = g_task_new (loader, cancellable, callback, user_data); + g_task_set_priority (loader->task, io_priority); task_data = task_data_new (); - g_task_set_task_data (loader->priv->task, task_data, task_data_free); + g_task_set_task_data (loader->task, task_data, task_data_free); task_data->progress_cb = progress_callback; task_data->progress_cb_data = progress_callback_data; task_data->progress_cb_notify = progress_callback_notify; - if (loader->priv->source_buffer == NULL || - loader->priv->file == NULL || - (loader->priv->location == NULL && loader->priv->input_stream_property == NULL)) + if (loader->source_buffer == NULL || + loader->file == NULL || + (loader->location == NULL && loader->input_stream_property == NULL)) { - g_task_return_boolean (loader->priv->task, FALSE); + g_task_return_boolean (loader->task, FALSE); return; } @@ -1144,36 +1145,36 @@ gtk_source_file_loader_load_async (GtkSourceFileLoader *loader, * location is directly needed (for example to display the filename in a * tab or an info bar with the progress information). */ - if (loader->priv->input_stream_property != NULL) + if (loader->input_stream_property != NULL) { - gtk_source_file_set_location (loader->priv->file, NULL); + gtk_source_file_set_location (loader->file, NULL); } else { - gtk_source_file_set_location (loader->priv->file, - loader->priv->location); + gtk_source_file_set_location (loader->file, + loader->location); } - implicit_trailing_newline = gtk_source_buffer_get_implicit_trailing_newline (loader->priv->source_buffer); + implicit_trailing_newline = gtk_source_buffer_get_implicit_trailing_newline (loader->source_buffer); /* The BufferOutputStream has a strong reference to the buffer. * We create the BufferOutputStream here so we are sure that the * buffer will not be destroyed during the file loading. */ - task_data->output_stream = gtk_source_buffer_output_stream_new (loader->priv->source_buffer, - loader->priv->candidate_encodings, + task_data->output_stream = gtk_source_buffer_output_stream_new (loader->source_buffer, + loader->candidate_encodings, implicit_trailing_newline); - if (loader->priv->input_stream_property != NULL) + if (loader->input_stream_property != NULL) { task_data->guess_content_type_from_content = TRUE; task_data->info = g_file_info_new (); - create_input_stream (loader->priv->task); + create_input_stream (loader->task); } else { - open_file (loader->priv->task); + open_file (loader->task); } } @@ -1194,8 +1195,8 @@ gtk_source_file_loader_load_async (GtkSourceFileLoader *loader, */ gboolean gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader, - GAsyncResult *result, - GError **error) + GAsyncResult *result, + GError **error) { gboolean ok; gboolean update_file_properties; @@ -1224,7 +1225,7 @@ gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader, real_error->domain == GTK_SOURCE_FILE_LOADER_ERROR && real_error->code == GTK_SOURCE_FILE_LOADER_ERROR_CONVERSION_FALLBACK); - if (update_file_properties && loader->priv->file != NULL) + if (update_file_properties && loader->file != NULL) { TaskData *task_data; @@ -1234,24 +1235,24 @@ gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader, * operation. */ - _gtk_source_file_set_encoding (loader->priv->file, - loader->priv->auto_detected_encoding); + _gtk_source_file_set_encoding (loader->file, + loader->auto_detected_encoding); - _gtk_source_file_set_newline_type (loader->priv->file, - loader->priv->auto_detected_newline_type); + _gtk_source_file_set_newline_type (loader->file, + loader->auto_detected_newline_type); - _gtk_source_file_set_compression_type (loader->priv->file, - loader->priv->auto_detected_compression_type); + _gtk_source_file_set_compression_type (loader->file, + loader->auto_detected_compression_type); - _gtk_source_file_set_externally_modified (loader->priv->file, FALSE); - _gtk_source_file_set_deleted (loader->priv->file, FALSE); + _gtk_source_file_set_externally_modified (loader->file, FALSE); + _gtk_source_file_set_deleted (loader->file, FALSE); if (g_file_info_has_attribute (task_data->info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) { GTimeVal modification_time; g_file_info_get_modification_time (task_data->info, &modification_time); - _gtk_source_file_set_modification_time (loader->priv->file, modification_time); + _gtk_source_file_set_modification_time (loader->file, modification_time); } if (g_file_info_has_attribute (task_data->info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) @@ -1261,15 +1262,15 @@ gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader, readonly = !g_file_info_get_attribute_boolean (task_data->info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE); - _gtk_source_file_set_readonly (loader->priv->file, readonly); + _gtk_source_file_set_readonly (loader->file, readonly); } else { - _gtk_source_file_set_readonly (loader->priv->file, FALSE); + _gtk_source_file_set_readonly (loader->file, FALSE); } } - g_clear_object (&loader->priv->task); + g_clear_object (&loader->task); if (real_error != NULL) { @@ -1291,7 +1292,7 @@ gtk_source_file_loader_get_encoding (GtkSourceFileLoader *loader) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), NULL); - return loader->priv->auto_detected_encoding; + return loader->auto_detected_encoding; } /** @@ -1307,7 +1308,7 @@ gtk_source_file_loader_get_newline_type (GtkSourceFileLoader *loader) g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), GTK_SOURCE_NEWLINE_TYPE_LF); - return loader->priv->auto_detected_newline_type; + return loader->auto_detected_newline_type; } /** @@ -1323,5 +1324,5 @@ gtk_source_file_loader_get_compression_type (GtkSourceFileLoader *loader) g_return_val_if_fail (GTK_SOURCE_IS_FILE_LOADER (loader), GTK_SOURCE_COMPRESSION_TYPE_NONE); - return loader->priv->auto_detected_compression_type; + return loader->auto_detected_compression_type; } diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtksourcefileloader.h index 1f45380f..09071090 100644 --- a/gtksourceview/gtksourcefileloader.h +++ b/gtksourceview/gtksourcefileloader.h @@ -33,17 +33,8 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_FILE_LOADER (gtk_source_file_loader_get_type()) -#define GTK_SOURCE_FILE_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_FILE_LOADER, GtkSourceFileLoader)) -#define GTK_SOURCE_FILE_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_FILE_LOADER, GtkSourceFileLoaderClass)) -#define GTK_SOURCE_IS_FILE_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_FILE_LOADER)) -#define GTK_SOURCE_IS_FILE_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_FILE_LOADER)) -#define GTK_SOURCE_FILE_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_FILE_LOADER, GtkSourceFileLoaderClass)) - -typedef struct _GtkSourceFileLoaderClass GtkSourceFileLoaderClass; -typedef struct _GtkSourceFileLoaderPrivate GtkSourceFileLoaderPrivate; - -#define GTK_SOURCE_FILE_LOADER_ERROR gtk_source_file_loader_error_quark () +#define GTK_SOURCE_TYPE_FILE_LOADER (gtk_source_file_loader_get_type()) +#define GTK_SOURCE_FILE_LOADER_ERROR (gtk_source_file_loader_error_quark()) /** * GtkSourceFileLoaderError: @@ -62,76 +53,47 @@ typedef enum _GtkSourceFileLoaderError GTK_SOURCE_FILE_LOADER_ERROR_CONVERSION_FALLBACK } GtkSourceFileLoaderError; -struct _GtkSourceFileLoader -{ - GObject parent; - - GtkSourceFileLoaderPrivate *priv; -}; - -struct _GtkSourceFileLoaderClass -{ - GObjectClass parent_class; - - gpointer padding[10]; -}; - GTK_SOURCE_AVAILABLE_IN_3_14 -GType gtk_source_file_loader_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceFileLoader, gtk_source_file_loader, GTK_SOURCE, FILE_LOADER, GObject) GTK_SOURCE_AVAILABLE_IN_3_14 -GQuark gtk_source_file_loader_error_quark (void); - +GQuark gtk_source_file_loader_error_quark (void); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFileLoader *gtk_source_file_loader_new (GtkSourceBuffer *buffer, - GtkSourceFile *file); - +GtkSourceFileLoader *gtk_source_file_loader_new (GtkSourceBuffer *buffer, + GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFileLoader *gtk_source_file_loader_new_from_stream (GtkSourceBuffer *buffer, - GtkSourceFile *file, - GInputStream *stream); - +GtkSourceFileLoader *gtk_source_file_loader_new_from_stream (GtkSourceBuffer *buffer, + GtkSourceFile *file, + GInputStream *stream); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_loader_set_candidate_encodings - (GtkSourceFileLoader *loader, - GSList *candidate_encodings); - +void gtk_source_file_loader_set_candidate_encodings (GtkSourceFileLoader *loader, + GSList *candidate_encodings); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceBuffer *gtk_source_file_loader_get_buffer (GtkSourceFileLoader *loader); - +GtkSourceBuffer *gtk_source_file_loader_get_buffer (GtkSourceFileLoader *loader); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFile *gtk_source_file_loader_get_file (GtkSourceFileLoader *loader); - +GtkSourceFile *gtk_source_file_loader_get_file (GtkSourceFileLoader *loader); GTK_SOURCE_AVAILABLE_IN_3_14 -GFile *gtk_source_file_loader_get_location (GtkSourceFileLoader *loader); - +GFile *gtk_source_file_loader_get_location (GtkSourceFileLoader *loader); GTK_SOURCE_AVAILABLE_IN_3_14 -GInputStream *gtk_source_file_loader_get_input_stream - (GtkSourceFileLoader *loader); - +GInputStream *gtk_source_file_loader_get_input_stream (GtkSourceFileLoader *loader); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_loader_load_async (GtkSourceFileLoader *loader, - gint io_priority, - GCancellable *cancellable, - GFileProgressCallback progress_callback, - gpointer progress_callback_data, - GDestroyNotify progress_callback_notify, - GAsyncReadyCallback callback, - gpointer user_data); - +void gtk_source_file_loader_load_async (GtkSourceFileLoader *loader, + gint io_priority, + GCancellable *cancellable, + GFileProgressCallback progress_callback, + gpointer progress_callback_data, + GDestroyNotify progress_callback_notify, + GAsyncReadyCallback callback, + gpointer user_data); GTK_SOURCE_AVAILABLE_IN_3_14 -gboolean gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader, - GAsyncResult *result, - GError **error); - +gboolean gtk_source_file_loader_load_finish (GtkSourceFileLoader *loader, + GAsyncResult *result, + GError **error); GTK_SOURCE_AVAILABLE_IN_3_14 -const GtkSourceEncoding *gtk_source_file_loader_get_encoding (GtkSourceFileLoader *loader); - +const GtkSourceEncoding *gtk_source_file_loader_get_encoding (GtkSourceFileLoader *loader); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceNewlineType gtk_source_file_loader_get_newline_type (GtkSourceFileLoader *loader); - +GtkSourceNewlineType gtk_source_file_loader_get_newline_type (GtkSourceFileLoader *loader); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceCompressionType gtk_source_file_loader_get_compression_type - (GtkSourceFileLoader *loader); +GtkSourceCompressionType gtk_source_file_loader_get_compression_type (GtkSourceFileLoader *loader); G_END_DECLS -- GitLab From 66121baf9b43741e67ebaf3149e79b18a9d36174 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 20:09:42 -0800 Subject: [PATCH 015/248] file: modernize GtkSourceFileSaver - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcefilesaver.c | 290 +++++++++++++------------- gtksourceview/gtksourcefilesaver.h | 110 ++++------ 3 files changed, 180 insertions(+), 221 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 2ed4003b..4f3858c3 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceFileSaver, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutter, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRenderer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererPixbuf, g_object_unref) diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c index 9c29aaec..a4f2e87d 100644 --- a/gtksourceview/gtksourcefilesaver.c +++ b/gtksourceview/gtksourcefilesaver.c @@ -80,8 +80,10 @@ enum PROP_FLAGS }; -struct _GtkSourceFileSaverPrivate +struct _GtkSourceFileSaver { + GObject parent_instance; + /* Weak ref to the GtkSourceBuffer. A strong ref could create a * reference cycle in an application. For example a subclass of * GtkSourceBuffer can have a strong ref to the FileSaver. @@ -104,8 +106,7 @@ struct _GtkSourceFileSaverPrivate GTask *task; }; -typedef struct _TaskData TaskData; -struct _TaskData +typedef struct { /* The output_stream contains the required converter(s) for the encoding * and the compression type. @@ -135,12 +136,12 @@ struct _TaskData gchar chunk_buffer[WRITE_CHUNK_SIZE]; guint tried_mount : 1; -}; +} TaskData; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceFileSaver, gtk_source_file_saver, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkSourceFileSaver, gtk_source_file_saver, G_TYPE_OBJECT) -static void read_file_chunk (GTask *task); -static void write_file_chunk (GTask *task); +static void read_file_chunk (GTask *task); +static void write_file_chunk (GTask *task); static void recover_not_mounted (GTask *task); static TaskData * @@ -174,31 +175,31 @@ task_data_free (gpointer data) static void gtk_source_file_saver_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceFileSaver *saver = GTK_SOURCE_FILE_SAVER (object); switch (prop_id) { case PROP_BUFFER: - g_assert (saver->priv->source_buffer == NULL); - saver->priv->source_buffer = g_value_get_object (value); - g_object_add_weak_pointer (G_OBJECT (saver->priv->source_buffer), - (gpointer *)&saver->priv->source_buffer); + g_assert (saver->source_buffer == NULL); + saver->source_buffer = g_value_get_object (value); + g_object_add_weak_pointer (G_OBJECT (saver->source_buffer), + (gpointer *)&saver->source_buffer); break; case PROP_FILE: - g_assert (saver->priv->file == NULL); - saver->priv->file = g_value_get_object (value); - g_object_add_weak_pointer (G_OBJECT (saver->priv->file), - (gpointer *)&saver->priv->file); + g_assert (saver->file == NULL); + saver->file = g_value_get_object (value); + g_object_add_weak_pointer (G_OBJECT (saver->file), + (gpointer *)&saver->file); break; case PROP_LOCATION: - g_assert (saver->priv->location == NULL); - saver->priv->location = g_value_dup_object (value); + g_assert (saver->location == NULL); + saver->location = g_value_dup_object (value); break; case PROP_ENCODING: @@ -225,40 +226,40 @@ gtk_source_file_saver_set_property (GObject *object, static void gtk_source_file_saver_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceFileSaver *saver = GTK_SOURCE_FILE_SAVER (object); switch (prop_id) { case PROP_BUFFER: - g_value_set_object (value, saver->priv->source_buffer); + g_value_set_object (value, saver->source_buffer); break; case PROP_FILE: - g_value_set_object (value, saver->priv->file); + g_value_set_object (value, saver->file); break; case PROP_LOCATION: - g_value_set_object (value, saver->priv->location); + g_value_set_object (value, saver->location); break; case PROP_ENCODING: - g_value_set_boxed (value, saver->priv->encoding); + g_value_set_boxed (value, saver->encoding); break; case PROP_NEWLINE_TYPE: - g_value_set_enum (value, saver->priv->newline_type); + g_value_set_enum (value, saver->newline_type); break; case PROP_COMPRESSION_TYPE: - g_value_set_enum (value, saver->priv->compression_type); + g_value_set_enum (value, saver->compression_type); break; case PROP_FLAGS: - g_value_set_flags (value, saver->priv->flags); + g_value_set_flags (value, saver->flags); break; default: @@ -272,24 +273,24 @@ gtk_source_file_saver_dispose (GObject *object) { GtkSourceFileSaver *saver = GTK_SOURCE_FILE_SAVER (object); - if (saver->priv->source_buffer != NULL) + if (saver->source_buffer != NULL) { - g_object_remove_weak_pointer (G_OBJECT (saver->priv->source_buffer), - (gpointer *)&saver->priv->source_buffer); + g_object_remove_weak_pointer (G_OBJECT (saver->source_buffer), + (gpointer *)&saver->source_buffer); - saver->priv->source_buffer = NULL; + saver->source_buffer = NULL; } - if (saver->priv->file != NULL) + if (saver->file != NULL) { - g_object_remove_weak_pointer (G_OBJECT (saver->priv->file), - (gpointer *)&saver->priv->file); + g_object_remove_weak_pointer (G_OBJECT (saver->file), + (gpointer *)&saver->file); - saver->priv->file = NULL; + saver->file = NULL; } - g_clear_object (&saver->priv->location); - g_clear_object (&saver->priv->task); + g_clear_object (&saver->location); + g_clear_object (&saver->task); G_OBJECT_CLASS (gtk_source_file_saver_parent_class)->dispose (object); } @@ -299,28 +300,28 @@ gtk_source_file_saver_constructed (GObject *object) { GtkSourceFileSaver *saver = GTK_SOURCE_FILE_SAVER (object); - if (saver->priv->file != NULL) + if (saver->file != NULL) { const GtkSourceEncoding *encoding; GtkSourceNewlineType newline_type; GtkSourceCompressionType compression_type; - encoding = gtk_source_file_get_encoding (saver->priv->file); + encoding = gtk_source_file_get_encoding (saver->file); gtk_source_file_saver_set_encoding (saver, encoding); - newline_type = gtk_source_file_get_newline_type (saver->priv->file); + newline_type = gtk_source_file_get_newline_type (saver->file); gtk_source_file_saver_set_newline_type (saver, newline_type); - compression_type = gtk_source_file_get_compression_type (saver->priv->file); + compression_type = gtk_source_file_get_compression_type (saver->file); gtk_source_file_saver_set_compression_type (saver, compression_type); - if (saver->priv->location == NULL) + if (saver->location == NULL) { - saver->priv->location = gtk_source_file_get_location (saver->priv->file); + saver->location = gtk_source_file_get_location (saver->file); - if (saver->priv->location != NULL) + if (saver->location != NULL) { - g_object_ref (saver->priv->location); + g_object_ref (saver->location); } else { @@ -480,7 +481,6 @@ gtk_source_file_saver_class_init (GtkSourceFileSaverClass *klass) static void gtk_source_file_saver_init (GtkSourceFileSaver *saver) { - saver->priv = gtk_source_file_saver_get_instance_private (saver); } /* BEGIN NOTE: @@ -506,8 +506,8 @@ gtk_source_file_saver_init (GtkSourceFileSaver *saver) */ static void cancel_output_stream_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GOutputStream *output_stream = G_OUTPUT_STREAM (source_object); GTask *task = G_TASK (user_data); @@ -559,8 +559,8 @@ cancel_output_stream (GTask *task) static void query_info_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -591,8 +591,8 @@ query_info_cb (GObject *source_object, static void close_output_stream_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GOutputStream *output_stream = G_OUTPUT_STREAM (source_object); GTask *task = G_TASK (user_data); @@ -625,7 +625,7 @@ close_output_stream_cb (GObject *source_object, g_print ("Query info on file\n"); }); - g_file_query_info_async (saver->priv->location, + g_file_query_info_async (saver->location, QUERY_ATTRIBUTES, G_FILE_QUERY_INFO_NONE, g_task_get_priority (task), @@ -675,8 +675,8 @@ write_complete (GTask *task) static void write_file_chunk_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GOutputStream *output_stream = G_OUTPUT_STREAM (source_object); GTask *task = G_TASK (user_data); @@ -794,8 +794,8 @@ read_file_chunk (GTask *task) static void replace_file_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -831,7 +831,7 @@ replace_file_cb (GObject *source_object, return; } - if (saver->priv->compression_type == GTK_SOURCE_COMPRESSION_TYPE_GZIP) + if (saver->compression_type == GTK_SOURCE_COMPRESSION_TYPE_GZIP) { GZlibCompressor *compressor; @@ -856,14 +856,14 @@ replace_file_cb (GObject *source_object, DEBUG ({ g_print ("Encoding charset: %s\n", - gtk_source_encoding_get_charset (saver->priv->encoding)); + gtk_source_encoding_get_charset (saver->encoding)); }); - if (saver->priv->encoding != gtk_source_encoding_get_utf8 ()) + if (saver->encoding != gtk_source_encoding_get_utf8 ()) { GCharsetConverter *converter; - converter = g_charset_converter_new (gtk_source_encoding_get_charset (saver->priv->encoding), + converter = g_charset_converter_new (gtk_source_encoding_get_charset (saver->encoding), "UTF-8", NULL); @@ -897,14 +897,14 @@ begin_write (GTask *task) saver = g_task_get_source_object (task); - create_backup = (saver->priv->flags & GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP) != 0; + create_backup = (saver->flags & GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP) != 0; DEBUG ({ g_print ("Start replacing file contents\n"); g_print ("Make backup: %s\n", create_backup ? "yes" : "no"); }); - g_file_replace_async (saver->priv->location, + g_file_replace_async (saver->location, NULL, create_backup, G_FILE_CREATE_NONE, @@ -916,8 +916,8 @@ begin_write (GTask *task) static void check_externally_modified_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -960,7 +960,7 @@ check_externally_modified_cb (GObject *source_object, return; } - if (_gtk_source_file_get_modification_time (saver->priv->file, &old_mtime) && + if (_gtk_source_file_get_modification_time (saver->file, &old_mtime) && info != NULL && g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) { @@ -998,21 +998,21 @@ check_externally_modified (GTask *task) saver = g_task_get_source_object (task); - if (saver->priv->file != NULL) + if (saver->file != NULL) { GFile *prev_location; - prev_location = gtk_source_file_get_location (saver->priv->file); + prev_location = gtk_source_file_get_location (saver->file); /* Don't check for externally modified for a "save as" operation, * because the user has normally accepted to overwrite the file if it * already exists. */ save_as = (prev_location == NULL || - !g_file_equal (prev_location, saver->priv->location)); + !g_file_equal (prev_location, saver->location)); } - if (saver->priv->flags & GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_MODIFICATION_TIME || + if (saver->flags & GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_MODIFICATION_TIME || save_as) { begin_write (task); @@ -1023,7 +1023,7 @@ check_externally_modified (GTask *task) g_print ("Check externally modified\n"); }); - g_file_query_info_async (saver->priv->location, + g_file_query_info_async (saver->location, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NONE, g_task_get_priority (task), @@ -1034,8 +1034,8 @@ check_externally_modified (GTask *task) static void mount_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GFile *location = G_FILE (source_object); GTask *task = G_TASK (user_data); @@ -1066,7 +1066,7 @@ recover_not_mounted (GTask *task) saver = g_task_get_source_object (task); task_data = g_task_get_task_data (task); - mount_operation = _gtk_source_file_create_mount_operation (saver->priv->file); + mount_operation = _gtk_source_file_create_mount_operation (saver->file); DEBUG ({ g_print ("%s\n", G_STRFUNC); @@ -1074,7 +1074,7 @@ recover_not_mounted (GTask *task) task_data->tried_mount = TRUE; - g_file_mount_enclosing_volume (saver->priv->location, + g_file_mount_enclosing_volume (saver->location, G_MOUNT_MOUNT_NONE, mount_operation, g_task_get_cancellable (task), @@ -1113,7 +1113,7 @@ gtk_source_file_saver_error_quark (void) */ GtkSourceFileSaver * gtk_source_file_saver_new (GtkSourceBuffer *buffer, - GtkSourceFile *file) + GtkSourceFile *file) { g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), NULL); @@ -1143,8 +1143,8 @@ gtk_source_file_saver_new (GtkSourceBuffer *buffer, */ GtkSourceFileSaver * gtk_source_file_saver_new_with_target (GtkSourceBuffer *buffer, - GtkSourceFile *file, - GFile *target_location) + GtkSourceFile *file, + GFile *target_location) { g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_SOURCE_IS_FILE (file), NULL); @@ -1169,7 +1169,7 @@ gtk_source_file_saver_get_buffer (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), NULL); - return saver->priv->source_buffer; + return saver->source_buffer; } /** @@ -1184,7 +1184,7 @@ gtk_source_file_saver_get_file (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), NULL); - return saver->priv->file; + return saver->file; } /** @@ -1199,7 +1199,7 @@ gtk_source_file_saver_get_location (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), NULL); - return saver->priv->location; + return saver->location; } /** @@ -1214,19 +1214,19 @@ gtk_source_file_saver_get_location (GtkSourceFileSaver *saver) */ void gtk_source_file_saver_set_encoding (GtkSourceFileSaver *saver, - const GtkSourceEncoding *encoding) + const GtkSourceEncoding *encoding) { g_return_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver)); - g_return_if_fail (saver->priv->task == NULL); + g_return_if_fail (saver->task == NULL); if (encoding == NULL) { encoding = gtk_source_encoding_get_utf8 (); } - if (saver->priv->encoding != encoding) + if (saver->encoding != encoding) { - saver->priv->encoding = encoding; + saver->encoding = encoding; g_object_notify (G_OBJECT (saver), "encoding"); } } @@ -1243,7 +1243,7 @@ gtk_source_file_saver_get_encoding (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), NULL); - return saver->priv->encoding; + return saver->encoding; } /** @@ -1258,14 +1258,14 @@ gtk_source_file_saver_get_encoding (GtkSourceFileSaver *saver) */ void gtk_source_file_saver_set_newline_type (GtkSourceFileSaver *saver, - GtkSourceNewlineType newline_type) + GtkSourceNewlineType newline_type) { g_return_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver)); - g_return_if_fail (saver->priv->task == NULL); + g_return_if_fail (saver->task == NULL); - if (saver->priv->newline_type != newline_type) + if (saver->newline_type != newline_type) { - saver->priv->newline_type = newline_type; + saver->newline_type = newline_type; g_object_notify (G_OBJECT (saver), "newline-type"); } } @@ -1282,7 +1282,7 @@ gtk_source_file_saver_get_newline_type (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), GTK_SOURCE_NEWLINE_TYPE_DEFAULT); - return saver->priv->newline_type; + return saver->newline_type; } /** @@ -1297,14 +1297,14 @@ gtk_source_file_saver_get_newline_type (GtkSourceFileSaver *saver) */ void gtk_source_file_saver_set_compression_type (GtkSourceFileSaver *saver, - GtkSourceCompressionType compression_type) + GtkSourceCompressionType compression_type) { g_return_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver)); - g_return_if_fail (saver->priv->task == NULL); + g_return_if_fail (saver->task == NULL); - if (saver->priv->compression_type != compression_type) + if (saver->compression_type != compression_type) { - saver->priv->compression_type = compression_type; + saver->compression_type = compression_type; g_object_notify (G_OBJECT (saver), "compression-type"); } } @@ -1321,7 +1321,7 @@ gtk_source_file_saver_get_compression_type (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), GTK_SOURCE_COMPRESSION_TYPE_NONE); - return saver->priv->compression_type; + return saver->compression_type; } /** @@ -1333,14 +1333,14 @@ gtk_source_file_saver_get_compression_type (GtkSourceFileSaver *saver) */ void gtk_source_file_saver_set_flags (GtkSourceFileSaver *saver, - GtkSourceFileSaverFlags flags) + GtkSourceFileSaverFlags flags) { g_return_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver)); - g_return_if_fail (saver->priv->task == NULL); + g_return_if_fail (saver->task == NULL); - if (saver->priv->flags != flags) + if (saver->flags != flags) { - saver->priv->flags = flags; + saver->flags = flags; g_object_notify (G_OBJECT (saver), "flags"); } } @@ -1357,7 +1357,7 @@ gtk_source_file_saver_get_flags (GtkSourceFileSaver *saver) { g_return_val_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver), GTK_SOURCE_FILE_SAVER_FLAGS_NONE); - return saver->priv->flags; + return saver->flags; } /** @@ -1386,14 +1386,14 @@ gtk_source_file_saver_get_flags (GtkSourceFileSaver *saver) * https://bugzilla.gnome.org/show_bug.cgi?id=616044 */ void -gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, - gint io_priority, - GCancellable *cancellable, - GFileProgressCallback progress_callback, - gpointer progress_callback_data, - GDestroyNotify progress_callback_notify, - GAsyncReadyCallback callback, - gpointer user_data) +gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, + gint io_priority, + GCancellable *cancellable, + GFileProgressCallback progress_callback, + gpointer progress_callback_data, + GDestroyNotify progress_callback_notify, + GAsyncReadyCallback callback, + gpointer user_data) { TaskData *task_data; gboolean check_invalid_chars; @@ -1401,31 +1401,31 @@ gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, g_return_if_fail (GTK_SOURCE_IS_FILE_SAVER (saver)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (saver->priv->task == NULL); + g_return_if_fail (saver->task == NULL); - saver->priv->task = g_task_new (saver, cancellable, callback, user_data); - g_task_set_priority (saver->priv->task, io_priority); + saver->task = g_task_new (saver, cancellable, callback, user_data); + g_task_set_priority (saver->task, io_priority); task_data = task_data_new (); - g_task_set_task_data (saver->priv->task, task_data, task_data_free); + g_task_set_task_data (saver->task, task_data, task_data_free); task_data->progress_cb = progress_callback; task_data->progress_cb_data = progress_callback_data; task_data->progress_cb_notify = progress_callback_notify; - if (saver->priv->source_buffer == NULL || - saver->priv->file == NULL || - saver->priv->location == NULL) + if (saver->source_buffer == NULL || + saver->file == NULL || + saver->location == NULL) { - g_task_return_boolean (saver->priv->task, FALSE); + g_task_return_boolean (saver->task, FALSE); return; } - check_invalid_chars = (saver->priv->flags & GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_INVALID_CHARS) == 0; + check_invalid_chars = (saver->flags & GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_INVALID_CHARS) == 0; - if (check_invalid_chars && _gtk_source_buffer_has_invalid_chars (saver->priv->source_buffer)) + if (check_invalid_chars && _gtk_source_buffer_has_invalid_chars (saver->source_buffer)) { - g_task_return_new_error (saver->priv->task, + g_task_return_new_error (saver->task, GTK_SOURCE_FILE_SAVER_ERROR, GTK_SOURCE_FILE_SAVER_ERROR_INVALID_CHARS, _("The buffer contains invalid characters.")); @@ -1436,17 +1436,17 @@ gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, g_print ("Start saving\n"); }); - implicit_trailing_newline = gtk_source_buffer_get_implicit_trailing_newline (saver->priv->source_buffer); + implicit_trailing_newline = gtk_source_buffer_get_implicit_trailing_newline (saver->source_buffer); /* The BufferInputStream has a strong reference to the buffer. * We create the BufferInputStream here so we are sure that the * buffer will not be destroyed during the file saving. */ - task_data->input_stream = _gtk_source_buffer_input_stream_new (GTK_TEXT_BUFFER (saver->priv->source_buffer), - saver->priv->newline_type, + task_data->input_stream = _gtk_source_buffer_input_stream_new (GTK_TEXT_BUFFER (saver->source_buffer), + saver->newline_type, implicit_trailing_newline); - check_externally_modified (saver->priv->task); + check_externally_modified (saver->task); } /** @@ -1469,8 +1469,8 @@ gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, */ gboolean gtk_source_file_saver_save_finish (GtkSourceFileSaver *saver, - GAsyncResult *result, - GError **error) + GAsyncResult *result, + GError **error) { gboolean ok; @@ -1480,25 +1480,25 @@ gtk_source_file_saver_save_finish (GtkSourceFileSaver *saver, ok = g_task_propagate_boolean (G_TASK (result), error); - if (ok && saver->priv->file != NULL) + if (ok && saver->file != NULL) { TaskData *task_data; - gtk_source_file_set_location (saver->priv->file, - saver->priv->location); + gtk_source_file_set_location (saver->file, + saver->location); - _gtk_source_file_set_encoding (saver->priv->file, - saver->priv->encoding); + _gtk_source_file_set_encoding (saver->file, + saver->encoding); - _gtk_source_file_set_newline_type (saver->priv->file, - saver->priv->newline_type); + _gtk_source_file_set_newline_type (saver->file, + saver->newline_type); - _gtk_source_file_set_compression_type (saver->priv->file, - saver->priv->compression_type); + _gtk_source_file_set_compression_type (saver->file, + saver->compression_type); - _gtk_source_file_set_externally_modified (saver->priv->file, FALSE); - _gtk_source_file_set_deleted (saver->priv->file, FALSE); - _gtk_source_file_set_readonly (saver->priv->file, FALSE); + _gtk_source_file_set_externally_modified (saver->file, FALSE); + _gtk_source_file_set_deleted (saver->file, FALSE); + _gtk_source_file_set_readonly (saver->file, FALSE); task_data = g_task_get_task_data (G_TASK (result)); @@ -1507,17 +1507,17 @@ gtk_source_file_saver_save_finish (GtkSourceFileSaver *saver, GTimeVal modification_time; g_file_info_get_modification_time (task_data->info, &modification_time); - _gtk_source_file_set_modification_time (saver->priv->file, modification_time); + _gtk_source_file_set_modification_time (saver->file, modification_time); } } - if (ok && saver->priv->source_buffer != NULL) + if (ok && saver->source_buffer != NULL) { - gtk_text_buffer_set_modified (GTK_TEXT_BUFFER (saver->priv->source_buffer), + gtk_text_buffer_set_modified (GTK_TEXT_BUFFER (saver->source_buffer), FALSE); } - g_clear_object (&saver->priv->task); + g_clear_object (&saver->task); return ok; } diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtksourcefilesaver.h index b835bea9..117a1579 100644 --- a/gtksourceview/gtksourcefilesaver.h +++ b/gtksourceview/gtksourcefilesaver.h @@ -33,17 +33,8 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_FILE_SAVER (gtk_source_file_saver_get_type()) -#define GTK_SOURCE_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_FILE_SAVER, GtkSourceFileSaver)) -#define GTK_SOURCE_FILE_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_FILE_SAVER, GtkSourceFileSaverClass)) -#define GTK_SOURCE_IS_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_FILE_SAVER)) -#define GTK_SOURCE_IS_FILE_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_FILE_SAVER)) -#define GTK_SOURCE_FILE_SAVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_FILE_SAVER, GtkSourceFileSaverClass)) - -typedef struct _GtkSourceFileSaverClass GtkSourceFileSaverClass; -typedef struct _GtkSourceFileSaverPrivate GtkSourceFileSaverPrivate; - -#define GTK_SOURCE_FILE_SAVER_ERROR gtk_source_file_saver_error_quark () +#define GTK_SOURCE_TYPE_FILE_SAVER (gtk_source_file_saver_get_type()) +#define GTK_SOURCE_FILE_SAVER_ERROR (gtk_source_file_saver_error_quark()) /** * GtkSourceFileSaverError: @@ -79,87 +70,56 @@ typedef enum _GtkSourceFileSaverFlags GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP = 1 << 2 } GtkSourceFileSaverFlags; -struct _GtkSourceFileSaver -{ - GObject object; - - GtkSourceFileSaverPrivate *priv; -}; - -struct _GtkSourceFileSaverClass -{ - GObjectClass parent_class; - - gpointer padding[10]; -}; - GTK_SOURCE_AVAILABLE_IN_3_14 -GType gtk_source_file_saver_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceFileSaver, gtk_source_file_saver, GTK_SOURCE, FILE_SAVER, GObject) GTK_SOURCE_AVAILABLE_IN_3_14 -GQuark gtk_source_file_saver_error_quark (void); - +GQuark gtk_source_file_saver_error_quark (void); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFileSaver *gtk_source_file_saver_new (GtkSourceBuffer *buffer, - GtkSourceFile *file); - +GtkSourceFileSaver *gtk_source_file_saver_new (GtkSourceBuffer *buffer, + GtkSourceFile *file); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFileSaver *gtk_source_file_saver_new_with_target (GtkSourceBuffer *buffer, - GtkSourceFile *file, - GFile *target_location); - +GtkSourceFileSaver *gtk_source_file_saver_new_with_target (GtkSourceBuffer *buffer, + GtkSourceFile *file, + GFile *target_location); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceBuffer *gtk_source_file_saver_get_buffer (GtkSourceFileSaver *saver); - +GtkSourceBuffer *gtk_source_file_saver_get_buffer (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFile *gtk_source_file_saver_get_file (GtkSourceFileSaver *saver); - +GtkSourceFile *gtk_source_file_saver_get_file (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -GFile *gtk_source_file_saver_get_location (GtkSourceFileSaver *saver); - +GFile *gtk_source_file_saver_get_location (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_saver_set_encoding (GtkSourceFileSaver *saver, - const GtkSourceEncoding *encoding); - +void gtk_source_file_saver_set_encoding (GtkSourceFileSaver *saver, + const GtkSourceEncoding *encoding); GTK_SOURCE_AVAILABLE_IN_3_14 -const GtkSourceEncoding *gtk_source_file_saver_get_encoding (GtkSourceFileSaver *saver); - +const GtkSourceEncoding *gtk_source_file_saver_get_encoding (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_saver_set_newline_type (GtkSourceFileSaver *saver, - GtkSourceNewlineType newline_type); - +void gtk_source_file_saver_set_newline_type (GtkSourceFileSaver *saver, + GtkSourceNewlineType newline_type); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceNewlineType gtk_source_file_saver_get_newline_type (GtkSourceFileSaver *saver); - +GtkSourceNewlineType gtk_source_file_saver_get_newline_type (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_saver_set_compression_type - (GtkSourceFileSaver *saver, - GtkSourceCompressionType compression_type); - +void gtk_source_file_saver_set_compression_type (GtkSourceFileSaver *saver, + GtkSourceCompressionType compression_type); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceCompressionType gtk_source_file_saver_get_compression_type - (GtkSourceFileSaver *saver); - +GtkSourceCompressionType gtk_source_file_saver_get_compression_type (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_saver_set_flags (GtkSourceFileSaver *saver, - GtkSourceFileSaverFlags flags); - +void gtk_source_file_saver_set_flags (GtkSourceFileSaver *saver, + GtkSourceFileSaverFlags flags); GTK_SOURCE_AVAILABLE_IN_3_14 -GtkSourceFileSaverFlags gtk_source_file_saver_get_flags (GtkSourceFileSaver *saver); - +GtkSourceFileSaverFlags gtk_source_file_saver_get_flags (GtkSourceFileSaver *saver); GTK_SOURCE_AVAILABLE_IN_3_14 -void gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, - gint io_priority, - GCancellable *cancellable, - GFileProgressCallback progress_callback, - gpointer progress_callback_data, - GDestroyNotify progress_callback_notify, - GAsyncReadyCallback callback, - gpointer user_data); - +void gtk_source_file_saver_save_async (GtkSourceFileSaver *saver, + gint io_priority, + GCancellable *cancellable, + GFileProgressCallback progress_callback, + gpointer progress_callback_data, + GDestroyNotify progress_callback_notify, + GAsyncReadyCallback callback, + gpointer user_data); GTK_SOURCE_AVAILABLE_IN_3_14 -gboolean gtk_source_file_saver_save_finish (GtkSourceFileSaver *saver, - GAsyncResult *result, - GError **error); +gboolean gtk_source_file_saver_save_finish (GtkSourceFileSaver *saver, + GAsyncResult *result, + GError **error); G_END_DECLS -- GitLab From c3f2ac335807f7aae40744797596fa01838b54fc Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 20:16:31 -0800 Subject: [PATCH 016/248] gutter: modernize GtkSourceGutter - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcegutter.c | 245 +++++++++++++------------- gtksourceview/gtksourcegutter.h | 63 ++----- 3 files changed, 135 insertions(+), 174 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 4f3858c3..320e9f12 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutter, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRenderer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererPixbuf, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererText, g_object_unref) diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c index dcf88fee..9a988e53 100644 --- a/gtksourceview/gtksourcegutter.c +++ b/gtksourceview/gtksourcegutter.c @@ -70,8 +70,10 @@ typedef struct gulong notify_visible_handler; } Renderer; -struct _GtkSourceGutterPrivate +struct _GtkSourceGutter { + GObject parent_instance; + GtkSourceView *view; GtkTextWindowType window_type; GtkOrientation orientation; @@ -81,43 +83,36 @@ struct _GtkSourceGutterPrivate guint is_drawing : 1; }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceGutter, gtk_source_gutter, G_TYPE_OBJECT) - -static gboolean on_view_motion_notify_event (GtkSourceView *view, - GdkEventMotion *event, - GtkSourceGutter *gutter); - - -static gboolean on_view_enter_notify_event (GtkSourceView *view, - GdkEventCrossing *event, - GtkSourceGutter *gutter); - -static gboolean on_view_leave_notify_event (GtkSourceView *view, - GdkEventCrossing *event, - GtkSourceGutter *gutter); - -static gboolean on_view_button_press_event (GtkSourceView *view, - GdkEventButton *event, - GtkSourceGutter *gutter); - -static gboolean on_view_query_tooltip (GtkSourceView *view, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - GtkSourceGutter *gutter); - -static void on_view_style_updated (GtkSourceView *view, - GtkSourceGutter *gutter); - -static void do_redraw (GtkSourceGutter *gutter); -static void update_gutter_size (GtkSourceGutter *gutter); +G_DEFINE_TYPE (GtkSourceGutter, gtk_source_gutter, G_TYPE_OBJECT) + +static gboolean on_view_motion_notify_event (GtkSourceView *view, + GdkEventMotion *event, + GtkSourceGutter *gutter); +static gboolean on_view_enter_notify_event (GtkSourceView *view, + GdkEventCrossing *event, + GtkSourceGutter *gutter); +static gboolean on_view_leave_notify_event (GtkSourceView *view, + GdkEventCrossing *event, + GtkSourceGutter *gutter); +static gboolean on_view_button_press_event (GtkSourceView *view, + GdkEventButton *event, + GtkSourceGutter *gutter); +static gboolean on_view_query_tooltip (GtkSourceView *view, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip, + GtkSourceGutter *gutter); +static void on_view_style_updated (GtkSourceView *view, + GtkSourceGutter *gutter); +static void do_redraw (GtkSourceGutter *gutter); +static void update_gutter_size (GtkSourceGutter *gutter); static GdkWindow * get_window (GtkSourceGutter *gutter) { - return gtk_text_view_get_window (GTK_TEXT_VIEW (gutter->priv->view), - gutter->priv->window_type); + return gtk_text_view_get_window (GTK_TEXT_VIEW (gutter->view), + gutter->window_type); } static void @@ -163,8 +158,8 @@ renderer_new (GtkSourceGutter *gutter, ret->prelit = -1; _gtk_source_gutter_renderer_set_view (renderer, - GTK_TEXT_VIEW (gutter->priv->view), - gutter->priv->window_type); + GTK_TEXT_VIEW (gutter->view), + gutter->window_type); ret->size_changed_handler = g_signal_connect (ret->renderer, @@ -230,10 +225,10 @@ gtk_source_gutter_dispose (GObject *object) { GtkSourceGutter *gutter = GTK_SOURCE_GUTTER (object); - g_list_free_full (gutter->priv->renderers, (GDestroyNotify)renderer_free); - gutter->priv->renderers = NULL; + g_list_free_full (gutter->renderers, (GDestroyNotify)renderer_free); + gutter->renderers = NULL; - gutter->priv->view = NULL; + gutter->view = NULL; G_OBJECT_CLASS (gtk_source_gutter_parent_class)->dispose (object); } @@ -249,10 +244,10 @@ gtk_source_gutter_get_property (GObject *object, switch (prop_id) { case PROP_VIEW: - g_value_set_object (value, self->priv->view); + g_value_set_object (value, self->view); break; case PROP_WINDOW_TYPE: - g_value_set_enum (value, self->priv->window_type); + g_value_set_enum (value, self->window_type); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -271,7 +266,7 @@ static void set_view (GtkSourceGutter *gutter, GtkSourceView *view) { - gutter->priv->view = view; + gutter->view = view; g_signal_connect_object (view, "motion-notify-event", @@ -321,10 +316,10 @@ do_redraw (GtkSourceGutter *gutter) { GdkWindow *window; - window = gtk_text_view_get_window (GTK_TEXT_VIEW (gutter->priv->view), - gutter->priv->window_type); + window = gtk_text_view_get_window (GTK_TEXT_VIEW (gutter->view), + gutter->window_type); - if (window && !gutter->priv->is_drawing) + if (window && !gutter->is_drawing) { gdk_window_invalidate_rect (window, NULL, FALSE); } @@ -332,13 +327,13 @@ do_redraw (GtkSourceGutter *gutter) static gint calculate_gutter_size (GtkSourceGutter *gutter, - GArray *sizes) + GArray *sizes) { GList *item; gint total_width = 0; /* Calculate size */ - for (item = gutter->priv->renderers; item; item = g_list_next (item)) + for (item = gutter->renderers; item; item = g_list_next (item)) { Renderer *renderer = item->data; gint width; @@ -377,16 +372,16 @@ update_gutter_size (GtkSourceGutter *gutter) { gint width = calculate_gutter_size (gutter, NULL); - gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (gutter->priv->view), - gutter->priv->window_type, + gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (gutter->view), + gutter->window_type, width); } static void -gtk_source_gutter_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +gtk_source_gutter_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceGutter *self = GTK_SOURCE_GUTTER (object); @@ -396,7 +391,7 @@ gtk_source_gutter_set_property (GObject *object, set_view (self, GTK_SOURCE_VIEW (g_value_get_object (value))); break; case PROP_WINDOW_TYPE: - self->priv->window_type = g_value_get_enum (value); + self->window_type = g_value_get_enum (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -411,14 +406,14 @@ gtk_source_gutter_constructed (GObject *object) gutter = GTK_SOURCE_GUTTER (object); - if (gutter->priv->window_type == GTK_TEXT_WINDOW_LEFT || - gutter->priv->window_type == GTK_TEXT_WINDOW_RIGHT) + if (gutter->window_type == GTK_TEXT_WINDOW_LEFT || + gutter->window_type == GTK_TEXT_WINDOW_RIGHT) { - gutter->priv->orientation = GTK_ORIENTATION_HORIZONTAL; + gutter->orientation = GTK_ORIENTATION_HORIZONTAL; } else { - gutter->priv->orientation = GTK_ORIENTATION_VERTICAL; + gutter->orientation = GTK_ORIENTATION_VERTICAL; } G_OBJECT_CLASS (gtk_source_gutter_parent_class)->constructed (object); @@ -466,7 +461,7 @@ gtk_source_gutter_class_init (GtkSourceGutterClass *klass) static void gtk_source_gutter_init (GtkSourceGutter *self) { - self->priv = gtk_source_gutter_get_instance_private (self); + self = gtk_source_gutter_get_instance_private (self); } static gint @@ -492,8 +487,8 @@ static void append_renderer (GtkSourceGutter *gutter, Renderer *renderer) { - gutter->priv->renderers = - g_list_insert_sorted_with_data (gutter->priv->renderers, + gutter->renderers = + g_list_insert_sorted_with_data (gutter->renderers, renderer, (GCompareDataFunc)sort_by_position, NULL); @@ -503,7 +498,7 @@ append_renderer (GtkSourceGutter *gutter, GtkSourceGutter * _gtk_source_gutter_new (GtkSourceView *view, - GtkTextWindowType type) + GtkTextWindowType type) { return g_object_new (GTK_SOURCE_TYPE_GUTTER, "view", view, @@ -525,7 +520,7 @@ gtk_source_gutter_get_view (GtkSourceGutter *gutter) { g_return_val_if_fail (GTK_SOURCE_IS_GUTTER (gutter), NULL); - return gutter->priv->view; + return gutter->view; } /** @@ -540,7 +535,7 @@ gtk_source_gutter_get_window_type (GtkSourceGutter *gutter) { g_return_val_if_fail (GTK_SOURCE_IS_GUTTER (gutter), GTK_TEXT_WINDOW_PRIVATE); - return gutter->priv->window_type; + return gutter->window_type; } /** @@ -584,7 +579,7 @@ renderer_find (GtkSourceGutter *gutter, { GList *list; - for (list = gutter->priv->renderers; list; list = g_list_next (list)) + for (list = gutter->renderers; list; list = g_list_next (list)) { *ret = list->data; @@ -625,8 +620,8 @@ gtk_source_gutter_reorder (GtkSourceGutter *gutter, if (renderer_find (gutter, renderer, &ret, &retlist)) { - gutter->priv->renderers = - g_list_delete_link (gutter->priv->renderers, + gutter->renderers = + g_list_delete_link (gutter->renderers, retlist); ret->position = position; @@ -655,8 +650,8 @@ gtk_source_gutter_remove (GtkSourceGutter *gutter, if (renderer_find (gutter, renderer, &ret, &retlist)) { - gutter->priv->renderers = - g_list_delete_link (gutter->priv->renderers, + gutter->renderers = + g_list_delete_link (gutter->renderers, retlist); update_gutter_size (gutter); @@ -681,9 +676,7 @@ gtk_source_gutter_queue_draw (GtkSourceGutter *gutter) do_redraw (gutter); } -typedef struct _LinesInfo LinesInfo; - -struct _LinesInfo +typedef struct { gint total_height; gint lines_count; @@ -692,7 +685,7 @@ struct _LinesInfo GArray *line_numbers; GtkTextIter start; GtkTextIter end; -}; +} LinesInfo; static LinesInfo * lines_info_new (void) @@ -724,8 +717,8 @@ lines_info_free (LinesInfo *info) /* This function is taken and adapted from gtk+/tests/testtext.c */ static LinesInfo * get_lines_info (GtkTextView *text_view, - gint first_y_buffer_coord, - gint last_y_buffer_coord) + gint first_y_buffer_coord, + gint last_y_buffer_coord) { LinesInfo *info; GtkTextIter iter; @@ -816,9 +809,9 @@ get_lines_info (GtkTextView *text_view, /* Returns %TRUE if @clip is set. @clip contains the area that should be drawn. */ static gboolean get_clip_rectangle (GtkSourceGutter *gutter, - GtkSourceView *view, - cairo_t *cr, - GdkRectangle *clip) + GtkSourceView *view, + cairo_t *cr, + GdkRectangle *clip) { GdkWindow *window = get_window (gutter); @@ -834,14 +827,14 @@ get_clip_rectangle (GtkSourceGutter *gutter, static void apply_style (GtkSourceGutter *gutter, - GtkSourceView *view, - GtkStyleContext *style_context, - cairo_t *cr) + GtkSourceView *view, + GtkStyleContext *style_context, + cairo_t *cr) { const gchar *class; GdkRGBA fg_color; - switch (gutter->priv->window_type) + switch (gutter->window_type) { case GTK_TEXT_WINDOW_TOP: class = GTK_STYLE_CLASS_TOP; @@ -880,10 +873,10 @@ apply_style (GtkSourceGutter *gutter, /* Call gtk_source_gutter_renderer_begin() on each renderer. */ static void begin_draw (GtkSourceGutter *gutter, - GtkTextView *view, - GArray *renderer_widths, - LinesInfo *info, - cairo_t *cr) + GtkTextView *view, + GArray *renderer_widths, + LinesInfo *info, + cairo_t *cr) { GdkRectangle background_area = { 0 }; GdkRectangle cell_area; @@ -894,7 +887,7 @@ begin_draw (GtkSourceGutter *gutter, background_area.height = info->total_height; gtk_text_view_buffer_to_window_coords (view, - gutter->priv->window_type, + gutter->window_type, 0, g_array_index (info->buffer_coords, gint, 0), NULL, @@ -902,7 +895,7 @@ begin_draw (GtkSourceGutter *gutter, cell_area = background_area; - for (l = gutter->priv->renderers, renderer_num = 0; + for (l = gutter->renderers, renderer_num = 0; l != NULL; l = l->next, renderer_num++) { @@ -947,10 +940,10 @@ begin_draw (GtkSourceGutter *gutter, static void draw_cells (GtkSourceGutter *gutter, - GtkTextView *view, - GArray *renderer_widths, - LinesInfo *info, - cairo_t *cr) + GtkTextView *view, + GArray *renderer_widths, + LinesInfo *info, + cairo_t *cr) { GtkTextBuffer *buffer; GtkTextIter insert_iter; @@ -1018,7 +1011,7 @@ draw_cells (GtkSourceGutter *gutter, * conversions. */ gtk_text_view_buffer_to_window_coords (view, - gutter->priv->window_type, + gutter->window_type, 0, g_array_index (info->buffer_coords, gint, i), NULL, @@ -1043,7 +1036,7 @@ draw_cells (GtkSourceGutter *gutter, state |= GTK_SOURCE_GUTTER_RENDERER_STATE_SELECTED; } - for (l = gutter->priv->renderers, renderer_num = 0; + for (l = gutter->renderers, renderer_num = 0; l != NULL; l = l->next, renderer_num++) { @@ -1116,7 +1109,7 @@ end_draw (GtkSourceGutter *gutter) { GList *l; - for (l = gutter->priv->renderers; l != NULL; l = l->next) + for (l = gutter->renderers; l != NULL; l = l->next) { Renderer *renderer = l->data; @@ -1129,8 +1122,8 @@ end_draw (GtkSourceGutter *gutter) void _gtk_source_gutter_draw (GtkSourceGutter *gutter, - GtkSourceView *view, - cairo_t *cr) + GtkSourceView *view, + cairo_t *cr) { GdkRectangle clip; GtkTextView *text_view; @@ -1147,7 +1140,7 @@ _gtk_source_gutter_draw (GtkSourceGutter *gutter, return; } - gutter->priv->is_drawing = TRUE; + gutter->is_drawing = TRUE; renderer_widths = g_array_new (FALSE, FALSE, sizeof (gint)); calculate_gutter_size (gutter, renderer_widths); @@ -1159,14 +1152,14 @@ _gtk_source_gutter_draw (GtkSourceGutter *gutter, /* get the extents of the line printing */ gtk_text_view_window_to_buffer_coords (text_view, - gutter->priv->window_type, + gutter->window_type, 0, first_y_window_coord, NULL, &first_y_buffer_coord); gtk_text_view_window_to_buffer_coords (text_view, - gutter->priv->window_type, + gutter->window_type, 0, last_y_window_coord, NULL, @@ -1193,7 +1186,7 @@ _gtk_source_gutter_draw (GtkSourceGutter *gutter, cr); /* Allow to call queue_redraw() in ::end. */ - gutter->priv->is_drawing = FALSE; + gutter->is_drawing = FALSE; end_draw (gutter); @@ -1217,7 +1210,7 @@ renderer_at_x (GtkSourceGutter *gutter, s = 0; - for (item = gutter->priv->renderers; item; item = g_list_next (item)) + for (item = gutter->renderers; item; item = g_list_next (item)) { Renderer *renderer = item->data; gint xpad; @@ -1269,15 +1262,15 @@ get_renderer_rect (GtkSourceGutter *gutter, rectangle->x = start; - gtk_text_view_get_line_yrange (GTK_TEXT_VIEW (gutter->priv->view), + gtk_text_view_get_line_yrange (GTK_TEXT_VIEW (gutter->view), iter, &y, &rectangle->height); rectangle->width = gtk_source_gutter_renderer_get_size (renderer->renderer); - gtk_text_view_buffer_to_window_coords (GTK_TEXT_VIEW (gutter->priv->view), - gutter->priv->window_type, + gtk_text_view_buffer_to_window_coords (GTK_TEXT_VIEW (gutter->view), + gutter->window_type, 0, y, NULL, @@ -1311,14 +1304,14 @@ renderer_query_activatable (GtkSourceGutter *gutter, return FALSE; } - gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (gutter->priv->view), - gutter->priv->window_type, + gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (gutter->view), + gutter->window_type, x, y, NULL, &y_buf); - gtk_text_view_get_line_at_y (GTK_TEXT_VIEW (gutter->priv->view), + gtk_text_view_get_line_at_y (GTK_TEXT_VIEW (gutter->view), &iter, y_buf, &yline); @@ -1353,10 +1346,10 @@ renderer_query_activatable (GtkSourceGutter *gutter, static gboolean redraw_for_window (GtkSourceGutter *gutter, - GdkEvent *event, - gboolean act_on_window, - gint x, - gint y) + GdkEvent *event, + gboolean act_on_window, + gint x, + gint y) { Renderer *at_x = NULL; gint start = 0; @@ -1375,7 +1368,7 @@ redraw_for_window (GtkSourceGutter *gutter, redraw = FALSE; - for (item = gutter->priv->renderers; item; item = g_list_next (item)) + for (item = gutter->renderers; item; item = g_list_next (item)) { Renderer *renderer = item->data; gint prelit = renderer->prelit; @@ -1419,9 +1412,9 @@ redraw_for_window (GtkSourceGutter *gutter, } static gboolean -on_view_motion_notify_event (GtkSourceView *view, - GdkEventMotion *event, - GtkSourceGutter *gutter) +on_view_motion_notify_event (GtkSourceView *view, + GdkEventMotion *event, + GtkSourceGutter *gutter) { return redraw_for_window (gutter, (GdkEvent *)event, @@ -1431,9 +1424,9 @@ on_view_motion_notify_event (GtkSourceView *view, } static gboolean -on_view_enter_notify_event (GtkSourceView *view, - GdkEventCrossing *event, - GtkSourceGutter *gutter) +on_view_enter_notify_event (GtkSourceView *view, + GdkEventCrossing *event, + GtkSourceGutter *gutter) { return redraw_for_window (gutter, (GdkEvent *)event, @@ -1443,9 +1436,9 @@ on_view_enter_notify_event (GtkSourceView *view, } static gboolean -on_view_leave_notify_event (GtkSourceView *view, - GdkEventCrossing *event, - GtkSourceGutter *gutter) +on_view_leave_notify_event (GtkSourceView *view, + GdkEventCrossing *event, + GtkSourceGutter *gutter) { return redraw_for_window (gutter, (GdkEvent *)event, @@ -1455,9 +1448,9 @@ on_view_leave_notify_event (GtkSourceView *view, } static gboolean -on_view_button_press_event (GtkSourceView *view, - GdkEventButton *event, - GtkSourceGutter *gutter) +on_view_button_press_event (GtkSourceView *view, + GdkEventButton *event, + GtkSourceGutter *gutter) { Renderer *renderer; GtkTextIter line_iter; @@ -1530,7 +1523,7 @@ on_view_query_tooltip (GtkSourceView *view, } gtk_text_view_window_to_buffer_coords (text_view, - gutter->priv->window_type, + gutter->window_type, x, y, NULL, &y_buf); diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h index 97247ed1..c9745b04 100644 --- a/gtksourceview/gtksourcegutter.h +++ b/gtksourceview/gtksourcegutter.h @@ -29,62 +29,31 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_GUTTER (gtk_source_gutter_get_type ()) -#define GTK_SOURCE_GUTTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutter)) -#define GTK_SOURCE_GUTTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutterClass)) -#define GTK_SOURCE_IS_GUTTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER)) -#define GTK_SOURCE_IS_GUTTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER)) -#define GTK_SOURCE_GUTTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutterClass)) - -typedef struct _GtkSourceGutterClass GtkSourceGutterClass; -typedef struct _GtkSourceGutterPrivate GtkSourceGutterPrivate; - -struct _GtkSourceGutter -{ - GObject parent; - - GtkSourceGutterPrivate *priv; -}; - -struct _GtkSourceGutterClass -{ - GObjectClass parent_class; - - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_GUTTER (gtk_source_gutter_get_type()) GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_gutter_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceGutter, gtk_source_gutter, GTK_SOURCE, GUTTER, GObject) GTK_SOURCE_AVAILABLE_IN_3_24 -GtkSourceView * - gtk_source_gutter_get_view (GtkSourceGutter *gutter); - +GtkSourceView *gtk_source_gutter_get_view (GtkSourceGutter *gutter); GTK_SOURCE_AVAILABLE_IN_3_24 -GtkTextWindowType - gtk_source_gutter_get_window_type (GtkSourceGutter *gutter); - +GtkTextWindowType gtk_source_gutter_get_window_type (GtkSourceGutter *gutter); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_gutter_insert (GtkSourceGutter *gutter, - GtkSourceGutterRenderer *renderer, - gint position); - +gboolean gtk_source_gutter_insert (GtkSourceGutter *gutter, + GtkSourceGutterRenderer *renderer, + gint position); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_reorder (GtkSourceGutter *gutter, - GtkSourceGutterRenderer *renderer, - gint position); - +void gtk_source_gutter_reorder (GtkSourceGutter *gutter, + GtkSourceGutterRenderer *renderer, + gint position); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_remove (GtkSourceGutter *gutter, - GtkSourceGutterRenderer *renderer); - +void gtk_source_gutter_remove (GtkSourceGutter *gutter, + GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_queue_draw (GtkSourceGutter *gutter); - +void gtk_source_gutter_queue_draw (GtkSourceGutter *gutter); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceGutterRenderer * - gtk_source_gutter_get_renderer_at_pos (GtkSourceGutter *gutter, - gint x, - gint y); +GtkSourceGutterRenderer *gtk_source_gutter_get_renderer_at_pos (GtkSourceGutter *gutter, + gint x, + gint y); G_END_DECLS -- GitLab From c89cf6108d3a99990ee14a44161bf52398d80091 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 20:31:06 -0800 Subject: [PATCH 017/248] gutter: modernize GtkSourceGutterRenderer - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - .../gtksourcegutterrenderer-private.h | 6 +- gtksourceview/gtksourcegutterrenderer.c | 169 +++++++----- gtksourceview/gtksourcegutterrenderer.h | 242 +++++++----------- 4 files changed, 208 insertions(+), 210 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 320e9f12..4a7c827a 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRenderer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererPixbuf, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererText, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguage, g_object_unref) diff --git a/gtksourceview/gtksourcegutterrenderer-private.h b/gtksourceview/gtksourcegutterrenderer-private.h index 5dc5dfd4..790fa6df 100644 --- a/gtksourceview/gtksourcegutterrenderer-private.h +++ b/gtksourceview/gtksourcegutterrenderer-private.h @@ -26,8 +26,8 @@ G_BEGIN_DECLS G_GNUC_INTERNAL -void _gtk_source_gutter_renderer_set_view (GtkSourceGutterRenderer *renderer, - GtkTextView *view, - GtkTextWindowType window_type); +void _gtk_source_gutter_renderer_set_view (GtkSourceGutterRenderer *renderer, + GtkTextView *view, + GtkTextWindowType window_type); G_END_DECLS diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c index 8ea50bc7..bcc6e5dc 100644 --- a/gtksourceview/gtksourcegutterrenderer.c +++ b/gtksourceview/gtksourcegutterrenderer.c @@ -81,7 +81,7 @@ enum N_SIGNALS }; -struct _GtkSourceGutterRendererPrivate +typedef struct { GtkTextView *view; GtkTextBuffer *buffer; @@ -101,7 +101,7 @@ struct _GtkSourceGutterRendererPrivate guint background_set : 1; guint visible : 1; -}; +} GtkSourceGutterRendererPrivate; static guint signals[N_SIGNALS]; @@ -127,35 +127,38 @@ static void set_buffer (GtkSourceGutterRenderer *renderer, GtkTextBuffer *buffer) { - if (renderer->priv->buffer != NULL) + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + + if (priv->buffer != NULL) { - g_object_remove_weak_pointer (G_OBJECT (renderer->priv->buffer), - (gpointer) &renderer->priv->buffer); + g_object_remove_weak_pointer (G_OBJECT (priv->buffer), + (gpointer) &priv->buffer); } if (buffer != NULL) { g_object_add_weak_pointer (G_OBJECT (buffer), - (gpointer) &renderer->priv->buffer); + (gpointer) &priv->buffer); } - renderer->priv->buffer = buffer; + priv->buffer = buffer; } static void emit_buffer_changed (GtkTextView *view, GtkSourceGutterRenderer *renderer) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); GtkTextBuffer* buffer; buffer = gtk_text_view_get_buffer (view); - if (buffer != renderer->priv->buffer) + if (buffer != priv->buffer) { if (GTK_SOURCE_GUTTER_RENDERER_GET_CLASS (renderer)->change_buffer) { GTK_SOURCE_GUTTER_RENDERER_GET_CLASS (renderer)->change_buffer (renderer, - renderer->priv->buffer); + priv->buffer); } set_buffer (renderer, buffer); @@ -174,6 +177,8 @@ static void renderer_change_view_impl (GtkSourceGutterRenderer *renderer, GtkTextView *old_view) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + if (old_view) { g_signal_handlers_disconnect_by_func (old_view, @@ -181,11 +186,11 @@ renderer_change_view_impl (GtkSourceGutterRenderer *renderer, renderer); } - if (renderer->priv->view) + if (priv->view) { - emit_buffer_changed (renderer->priv->view, renderer); + emit_buffer_changed (priv->view, renderer); - g_signal_connect (renderer->priv->view, + g_signal_connect (priv->view, "notify::buffer", G_CALLBACK (on_buffer_changed), renderer); @@ -195,13 +200,12 @@ renderer_change_view_impl (GtkSourceGutterRenderer *renderer, static void gtk_source_gutter_renderer_dispose (GObject *object) { - GtkSourceGutterRenderer *renderer; - - renderer = GTK_SOURCE_GUTTER_RENDERER (object); + GtkSourceGutterRenderer *renderer = GTK_SOURCE_GUTTER_RENDERER (object); + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); set_buffer (renderer, NULL); - if (renderer->priv->view) + if (priv->view) { _gtk_source_gutter_renderer_set_view (renderer, NULL, @@ -215,11 +219,13 @@ static void set_visible (GtkSourceGutterRenderer *renderer, gboolean visible) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + visible = visible != FALSE; - if (renderer->priv->visible != visible) + if (priv->visible != visible) { - renderer->priv->visible = visible; + priv->visible = visible; g_object_notify (G_OBJECT (renderer), "visible"); gtk_source_gutter_renderer_queue_draw (renderer); @@ -247,8 +253,10 @@ static gboolean set_xpad (GtkSourceGutterRenderer *renderer, gint xpad) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + return set_padding (renderer, - &renderer->priv->xpad, + &priv->xpad, xpad, "xpad"); } @@ -257,8 +265,10 @@ static gboolean set_ypad (GtkSourceGutterRenderer *renderer, gint ypad) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + return set_padding (renderer, - &renderer->priv->ypad, + &priv->ypad, ypad, "ypad"); } @@ -291,8 +301,10 @@ set_xalign (GtkSourceGutterRenderer *renderer, gfloat xalign, gboolean emit) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + return set_alignment (renderer, - &renderer->priv->xalign, + &priv->xalign, xalign, "xalign", emit); @@ -303,8 +315,10 @@ set_yalign (GtkSourceGutterRenderer *renderer, gfloat yalign, gboolean emit) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + return set_alignment (renderer, - &renderer->priv->yalign, + &priv->yalign, yalign, "yalign", emit); @@ -314,12 +328,14 @@ static void set_alignment_mode (GtkSourceGutterRenderer *renderer, GtkSourceGutterRendererAlignmentMode mode) { - if (renderer->priv->alignment_mode == mode) + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + + if (priv->alignment_mode == mode) { return; } - renderer->priv->alignment_mode = mode; + priv->alignment_mode = mode; g_object_notify (G_OBJECT (renderer), "alignment-mode"); gtk_source_gutter_renderer_queue_draw (renderer); @@ -329,12 +345,14 @@ static void set_size (GtkSourceGutterRenderer *renderer, gint value) { - if (renderer->priv->size == value) + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + + if (priv->size == value) { return; } - renderer->priv->size = value; + priv->size = value; g_object_notify (G_OBJECT (renderer), "size"); } @@ -342,11 +360,13 @@ static void set_background_color_set (GtkSourceGutterRenderer *renderer, gboolean isset) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + isset = (isset != FALSE); - if (isset != renderer->priv->background_set) + if (isset != priv->background_set) { - renderer->priv->background_set = isset; + priv->background_set = isset; gtk_source_gutter_renderer_queue_draw (renderer); } } @@ -355,14 +375,16 @@ static void set_background_color (GtkSourceGutterRenderer *renderer, const GdkRGBA *color) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + if (!color) { set_background_color_set (renderer, FALSE); } else { - renderer->priv->background_color = *color; - renderer->priv->background_set = TRUE; + priv->background_color = *color; + priv->background_set = TRUE; gtk_source_gutter_renderer_queue_draw (renderer); } @@ -375,6 +397,7 @@ gtk_source_gutter_renderer_set_property (GObject *object, GParamSpec *pspec) { GtkSourceGutterRenderer *self = GTK_SOURCE_GUTTER_RENDERER (object); + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (self); switch (prop_id) { @@ -397,10 +420,10 @@ gtk_source_gutter_renderer_set_property (GObject *object, set_alignment_mode (self, g_value_get_enum (value)); break; case PROP_VIEW: - self->priv->view = g_value_get_object (value); + priv->view = g_value_get_object (value); break; case PROP_WINDOW_TYPE: - self->priv->window_type = g_value_get_enum (value); + priv->window_type = g_value_get_enum (value); break; case PROP_SIZE: set_size (self, g_value_get_int (value)); @@ -426,41 +449,42 @@ gtk_source_gutter_renderer_get_property (GObject *object, GParamSpec *pspec) { GtkSourceGutterRenderer *self = GTK_SOURCE_GUTTER_RENDERER (object); + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (self); switch (prop_id) { case PROP_VISIBLE: - g_value_set_boolean (value, self->priv->visible); + g_value_set_boolean (value, priv->visible); break; case PROP_XPAD: - g_value_set_int (value, self->priv->xpad); + g_value_set_int (value, priv->xpad); break; case PROP_YPAD: - g_value_set_int (value, self->priv->ypad); + g_value_set_int (value, priv->ypad); break; case PROP_XALIGN: - g_value_set_float (value, self->priv->xalign); + g_value_set_float (value, priv->xalign); break; case PROP_YALIGN: - g_value_set_float (value, self->priv->yalign); + g_value_set_float (value, priv->yalign); break; case PROP_VIEW: - g_value_set_object (value, self->priv->view); + g_value_set_object (value, priv->view); break; case PROP_ALIGNMENT_MODE: - g_value_set_enum (value, self->priv->alignment_mode); + g_value_set_enum (value, priv->alignment_mode); break; case PROP_WINDOW_TYPE: - g_value_set_enum (value, self->priv->window_type); + g_value_set_enum (value, priv->window_type); break; case PROP_SIZE: - g_value_set_int (value, self->priv->size); + g_value_set_int (value, priv->size); break; case PROP_BACKGROUND_RGBA: - g_value_set_boxed (value, &self->priv->background_color); + g_value_set_boxed (value, &priv->background_color); break; case PROP_BACKGROUND_SET: - g_value_set_boolean (value, self->priv->background_set); + g_value_set_boolean (value, priv->background_set); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -477,21 +501,23 @@ renderer_draw_impl (GtkSourceGutterRenderer *renderer, GtkTextIter *end, GtkSourceGutterRendererState state) { - if (renderer->priv->background_set) + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + + if (priv->background_set) { cairo_save (cr); gdk_cairo_rectangle (cr, background_area); - gdk_cairo_set_source_rgba (cr, &renderer->priv->background_color); + gdk_cairo_set_source_rgba (cr, &priv->background_color); cairo_fill (cr); cairo_restore (cr); } else if ((state & GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR) != 0 && - GTK_SOURCE_IS_VIEW (renderer->priv->view) && - gtk_source_view_get_highlight_current_line (GTK_SOURCE_VIEW (renderer->priv->view))) + GTK_SOURCE_IS_VIEW (priv->view) && + gtk_source_view_get_highlight_current_line (GTK_SOURCE_VIEW (priv->view))) { GtkStyleContext *context; - context = gtk_widget_get_style_context (GTK_WIDGET (renderer->priv->view)); + context = gtk_widget_get_style_context (GTK_WIDGET (priv->view)); gtk_style_context_save (context); gtk_style_context_add_class (context, "current-line-number"); @@ -813,7 +839,6 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass) static void gtk_source_gutter_renderer_init (GtkSourceGutterRenderer *self) { - self->priv = gtk_source_gutter_renderer_get_instance_private (self); } /** @@ -1121,9 +1146,11 @@ gtk_source_gutter_renderer_set_visible (GtkSourceGutterRenderer *renderer, gboolean gtk_source_gutter_renderer_get_visible (GtkSourceGutterRenderer *renderer) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE); - return renderer->priv->visible; + return priv->visible; } /** @@ -1164,16 +1191,18 @@ gtk_source_gutter_renderer_get_padding (GtkSourceGutterRenderer *renderer, gint *xpad, gint *ypad) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer)); if (xpad) { - *xpad = renderer->priv->xpad; + *xpad = priv->xpad; } if (ypad) { - *ypad = renderer->priv->ypad; + *ypad = priv->ypad; } } @@ -1225,16 +1254,18 @@ gtk_source_gutter_renderer_get_alignment (GtkSourceGutterRenderer *renderer, gfloat *xalign, gfloat *yalign) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer)); if (xalign) { - *xalign = renderer->priv->xalign; + *xalign = priv->xalign; } if (yalign) { - *yalign = renderer->priv->yalign; + *yalign = priv->yalign; } } @@ -1269,9 +1300,11 @@ gtk_source_gutter_renderer_set_alignment_mode (GtkSourceGutterRenderer GtkSourceGutterRendererAlignmentMode gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), 0); - return renderer->priv->alignment_mode; + return priv->alignment_mode; } /** @@ -1286,9 +1319,11 @@ gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer GtkTextWindowType gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), GTK_TEXT_WINDOW_PRIVATE); - return renderer->priv->window_type; + return priv->window_type; } /** @@ -1303,9 +1338,11 @@ gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer) GtkTextView * gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), NULL); - return renderer->priv->view; + return priv->view; } /** @@ -1320,9 +1357,11 @@ gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer) gint gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), 0); - return renderer->priv->size; + return priv->size; } /** @@ -1357,14 +1396,16 @@ gboolean gtk_source_gutter_renderer_get_background (GtkSourceGutterRenderer *renderer, GdkRGBA *color) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE); if (color) { - *color = renderer->priv->background_color; + *color = priv->background_color; } - return renderer->priv->background_set; + return priv->background_set; } /** @@ -1390,15 +1431,17 @@ _gtk_source_gutter_renderer_set_view (GtkSourceGutterRenderer *renderer, GtkTextView *view, GtkTextWindowType window_type) { + GtkSourceGutterRendererPrivate *priv = gtk_source_gutter_renderer_get_instance_private (renderer); + GtkTextView *old_view; g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer)); g_return_if_fail (view == NULL || GTK_IS_TEXT_VIEW (view)); - old_view = renderer->priv->view; + old_view = priv->view; - renderer->priv->window_type = window_type; - renderer->priv->view = view != NULL ? g_object_ref (view) : NULL; + priv->window_type = window_type; + priv->view = view != NULL ? g_object_ref (view) : NULL; if (GTK_SOURCE_GUTTER_RENDERER_GET_CLASS (renderer)->change_view) { diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h index 8a7ff106..4d8001e4 100644 --- a/gtksourceview/gtksourcegutterrenderer.h +++ b/gtksourceview/gtksourcegutterrenderer.h @@ -29,16 +29,7 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_GUTTER_RENDERER (gtk_source_gutter_renderer_get_type ()) -#define GTK_SOURCE_GUTTER_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRenderer)) -#define GTK_SOURCE_GUTTER_RENDERER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRenderer const)) -#define GTK_SOURCE_GUTTER_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRendererClass)) -#define GTK_SOURCE_IS_GUTTER_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER)) -#define GTK_SOURCE_IS_GUTTER_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER)) -#define GTK_SOURCE_GUTTER_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRendererClass)) - -typedef struct _GtkSourceGutterRendererClass GtkSourceGutterRendererClass; -typedef struct _GtkSourceGutterRendererPrivate GtkSourceGutterRendererPrivate; +#define GTK_SOURCE_TYPE_GUTTER_RENDERER (gtk_source_gutter_renderer_get_type()) /** * GtkSourceGutterRendererState: @@ -74,35 +65,27 @@ typedef enum _GtkSourceGutterRendererAlignmentMode GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_LAST } GtkSourceGutterRendererAlignmentMode; -struct _GtkSourceGutterRenderer -{ - GInitiallyUnowned parent; - - /*< private >*/ - GtkSourceGutterRendererPrivate *priv; -}; - struct _GtkSourceGutterRendererClass { GInitiallyUnownedClass parent_class; /*< public >*/ - void (*begin) (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end); - - void (*draw) (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceGutterRendererState state); - - void (*end) (GtkSourceGutterRenderer *renderer); + void (*begin) (GtkSourceGutterRenderer *renderer, + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end); + + void (*draw) (GtkSourceGutterRenderer *renderer, + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end, + GtkSourceGutterRendererState state); + + void (*end) (GtkSourceGutterRenderer *renderer); /** * GtkSourceGutterRendererClass::change_view: @@ -111,8 +94,8 @@ struct _GtkSourceGutterRendererClass * * This is called when the text view changes for @renderer. */ - void (*change_view) (GtkSourceGutterRenderer *renderer, - GtkTextView *old_view); + void (*change_view) (GtkSourceGutterRenderer *renderer, + GtkTextView *old_view); /** * GtkSourceGutterRendererClass::change_buffer: @@ -121,8 +104,8 @@ struct _GtkSourceGutterRendererClass * * This is called when the text buffer changes for @renderer. */ - void (*change_buffer) (GtkSourceGutterRenderer *renderer, - GtkTextBuffer *old_buffer); + void (*change_buffer) (GtkSourceGutterRenderer *renderer, + GtkTextBuffer *old_buffer); /* Signal handlers */ gboolean (*query_activatable) (GtkSourceGutterRenderer *renderer, @@ -130,140 +113,113 @@ struct _GtkSourceGutterRendererClass GdkRectangle *area, GdkEvent *event); - void (*activate) (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - GdkEvent *event); + void (*activate) (GtkSourceGutterRenderer *renderer, + GtkTextIter *iter, + GdkRectangle *area, + GdkEvent *event); - void (*queue_draw) (GtkSourceGutterRenderer *renderer); + void (*queue_draw) (GtkSourceGutterRenderer *renderer); - gboolean (*query_tooltip) (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - gint x, - gint y, - GtkTooltip *tooltip); + gboolean (*query_tooltip) (GtkSourceGutterRenderer *renderer, + GtkTextIter *iter, + GdkRectangle *area, + gint x, + gint y, + GtkTooltip *tooltip); - void (*query_data) (GtkSourceGutterRenderer *renderer, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceGutterRendererState state); + void (*query_data) (GtkSourceGutterRenderer *renderer, + GtkTextIter *start, + GtkTextIter *end, + GtkSourceGutterRendererState state); - gpointer padding[20]; + /*< private >*/ + gpointer _reserved[20]; }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_gutter_renderer_get_type (void) G_GNUC_CONST; +G_DECLARE_DERIVABLE_TYPE (GtkSourceGutterRenderer, gtk_source_gutter_renderer, GTK_SOURCE, GUTTER_RENDERER, GInitiallyUnowned) GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_begin (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end); - +void gtk_source_gutter_renderer_begin (GtkSourceGutterRenderer *renderer, + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_draw (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceGutterRendererState state); - +void gtk_source_gutter_renderer_draw (GtkSourceGutterRenderer *renderer, + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end, + GtkSourceGutterRendererState state); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_end (GtkSourceGutterRenderer *renderer); - +void gtk_source_gutter_renderer_end (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -gint gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer); - +gint gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_set_size (GtkSourceGutterRenderer *renderer, - gint size); - +void gtk_source_gutter_renderer_set_size (GtkSourceGutterRenderer *renderer, + gint size); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_set_visible (GtkSourceGutterRenderer *renderer, - gboolean visible); - +void gtk_source_gutter_renderer_set_visible (GtkSourceGutterRenderer *renderer, + gboolean visible); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_gutter_renderer_get_visible (GtkSourceGutterRenderer *renderer); - +gboolean gtk_source_gutter_renderer_get_visible (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_get_padding (GtkSourceGutterRenderer *renderer, - gint *xpad, - gint *ypad); - +void gtk_source_gutter_renderer_get_padding (GtkSourceGutterRenderer *renderer, + gint *xpad, + gint *ypad); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_set_padding (GtkSourceGutterRenderer *renderer, - gint xpad, - gint ypad); - +void gtk_source_gutter_renderer_set_padding (GtkSourceGutterRenderer *renderer, + gint xpad, + gint ypad); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_get_alignment (GtkSourceGutterRenderer *renderer, - gfloat *xalign, - gfloat *yalign); - +void gtk_source_gutter_renderer_get_alignment (GtkSourceGutterRenderer *renderer, + gfloat *xalign, + gfloat *yalign); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_set_alignment (GtkSourceGutterRenderer *renderer, - gfloat xalign, - gfloat yalign); - +void gtk_source_gutter_renderer_set_alignment (GtkSourceGutterRenderer *renderer, + gfloat xalign, + gfloat yalign); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_set_alignment_mode (GtkSourceGutterRenderer *renderer, - GtkSourceGutterRendererAlignmentMode mode); - +void gtk_source_gutter_renderer_set_alignment_mode (GtkSourceGutterRenderer *renderer, + GtkSourceGutterRendererAlignmentMode mode); GTK_SOURCE_AVAILABLE_IN_ALL -GtkTextWindowType - gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer); - +GtkTextWindowType gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -GtkTextView *gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer); - +GtkTextView *gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceGutterRendererAlignmentMode - gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer); - +GtkSourceGutterRendererAlignmentMode gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_gutter_renderer_get_background (GtkSourceGutterRenderer *renderer, - GdkRGBA *color); - +gboolean gtk_source_gutter_renderer_get_background (GtkSourceGutterRenderer *renderer, + GdkRGBA *color); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_set_background (GtkSourceGutterRenderer *renderer, - const GdkRGBA *color); - -/* Emits the 'activate' signal */ +void gtk_source_gutter_renderer_set_background (GtkSourceGutterRenderer *renderer, + const GdkRGBA *color); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_activate (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - GdkEvent *event); - -/* Emits the 'query-activatable' signal */ +void gtk_source_gutter_renderer_activate (GtkSourceGutterRenderer *renderer, + GtkTextIter *iter, + GdkRectangle *area, + GdkEvent *event); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_gutter_renderer_query_activatable (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - GdkEvent *event); - -/* Emits the 'queue-draw' signal */ +gboolean gtk_source_gutter_renderer_query_activatable (GtkSourceGutterRenderer *renderer, + GtkTextIter *iter, + GdkRectangle *area, + GdkEvent *event); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_queue_draw (GtkSourceGutterRenderer *renderer); - -/* Emits the 'query-tooltip' signal */ +void gtk_source_gutter_renderer_queue_draw (GtkSourceGutterRenderer *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_gutter_renderer_query_tooltip (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - gint x, - gint y, - GtkTooltip *tooltip); - -/* Emits the 'query-data' signal */ +gboolean gtk_source_gutter_renderer_query_tooltip (GtkSourceGutterRenderer *renderer, + GtkTextIter *iter, + GdkRectangle *area, + gint x, + gint y, + GtkTooltip *tooltip); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_query_data (GtkSourceGutterRenderer *renderer, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceGutterRendererState state); +void gtk_source_gutter_renderer_query_data (GtkSourceGutterRenderer *renderer, + GtkTextIter *start, + GtkTextIter *end, + GtkSourceGutterRendererState state); G_END_DECLS -- GitLab From 327c78238b26e78de16f4a94180393f19c5d26ee Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 20:39:33 -0800 Subject: [PATCH 018/248] gutter: modernize GtkSourceGutterRendererPixbuf - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcegutterrendererpixbuf.c | 52 +++++++++++------- gtksourceview/gtksourcegutterrendererpixbuf.h | 55 +++++-------------- 3 files changed, 46 insertions(+), 62 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 4a7c827a..c1a35a70 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererPixbuf, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererText, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguage, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguageManager, g_object_unref) diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c index 8fcbbc55..43f5ee9d 100644 --- a/gtksourceview/gtksourcegutterrendererpixbuf.c +++ b/gtksourceview/gtksourcegutterrendererpixbuf.c @@ -33,10 +33,10 @@ * #GtkSourceGutter. */ -struct _GtkSourceGutterRendererPixbufPrivate +typedef struct { GtkSourcePixbufHelper *helper; -}; +} GtkSourceGutterRendererPixbufPrivate; G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceGutterRendererPixbuf, gtk_source_gutter_renderer_pixbuf, GTK_SOURCE_TYPE_GUTTER_RENDERER) @@ -88,6 +88,7 @@ gutter_renderer_pixbuf_draw (GtkSourceGutterRenderer *renderer, GtkSourceGutterRendererState state) { GtkSourceGutterRendererPixbuf *pix = GTK_SOURCE_GUTTER_RENDERER_PIXBUF (renderer); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (pix); gint width; gint height; gfloat xalign; @@ -114,7 +115,7 @@ gutter_renderer_pixbuf_draw (GtkSourceGutterRenderer *renderer, view = gtk_source_gutter_renderer_get_view (renderer); - pixbuf = gtk_source_pixbuf_helper_render (pix->priv->helper, + pixbuf = gtk_source_pixbuf_helper_render (priv->helper, GTK_WIDGET (view), cell_area->width); @@ -192,8 +193,9 @@ static void gtk_source_gutter_renderer_pixbuf_finalize (GObject *object) { GtkSourceGutterRendererPixbuf *renderer = GTK_SOURCE_GUTTER_RENDERER_PIXBUF (object); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); - gtk_source_pixbuf_helper_free (renderer->priv->helper); + gtk_source_pixbuf_helper_free (priv->helper); G_OBJECT_CLASS (gtk_source_gutter_renderer_pixbuf_parent_class)->finalize (object); } @@ -202,8 +204,9 @@ static void set_pixbuf (GtkSourceGutterRendererPixbuf *renderer, GdkPixbuf *pixbuf) { - gtk_source_pixbuf_helper_set_pixbuf (renderer->priv->helper, - pixbuf); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); + + gtk_source_pixbuf_helper_set_pixbuf (priv->helper, pixbuf); g_object_notify (G_OBJECT (renderer), "pixbuf"); @@ -214,8 +217,9 @@ static void set_gicon (GtkSourceGutterRendererPixbuf *renderer, GIcon *icon) { - gtk_source_pixbuf_helper_set_gicon (renderer->priv->helper, - icon); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); + + gtk_source_pixbuf_helper_set_gicon (priv->helper, icon); g_object_notify (G_OBJECT (renderer), "gicon"); @@ -226,8 +230,9 @@ static void set_icon_name (GtkSourceGutterRendererPixbuf *renderer, const gchar *icon_name) { - gtk_source_pixbuf_helper_set_icon_name (renderer->priv->helper, - icon_name); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); + + gtk_source_pixbuf_helper_set_icon_name (priv->helper, icon_name); g_object_notify (G_OBJECT (renderer), "icon-name"); @@ -268,23 +273,22 @@ gtk_source_gutter_renderer_pixbuf_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GtkSourceGutterRendererPixbuf *renderer; - - renderer = GTK_SOURCE_GUTTER_RENDERER_PIXBUF (object); + GtkSourceGutterRendererPixbuf *renderer = GTK_SOURCE_GUTTER_RENDERER_PIXBUF (object); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); switch (prop_id) { case PROP_PIXBUF: g_value_set_object (value, - gtk_source_pixbuf_helper_get_pixbuf (renderer->priv->helper)); + gtk_source_pixbuf_helper_get_pixbuf (priv->helper)); break; case PROP_ICON_NAME: g_value_set_string (value, - gtk_source_pixbuf_helper_get_icon_name (renderer->priv->helper)); + gtk_source_pixbuf_helper_get_icon_name (priv->helper)); break; case PROP_GICON: g_value_set_object (value, - gtk_source_pixbuf_helper_get_gicon (renderer->priv->helper)); + gtk_source_pixbuf_helper_get_gicon (priv->helper)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -333,9 +337,9 @@ gtk_source_gutter_renderer_pixbuf_class_init (GtkSourceGutterRendererPixbufClass static void gtk_source_gutter_renderer_pixbuf_init (GtkSourceGutterRendererPixbuf *self) { - self->priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (self); + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (self); - self->priv->helper = gtk_source_pixbuf_helper_new (); + priv->helper = gtk_source_pixbuf_helper_new (); } /** @@ -380,9 +384,11 @@ gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *ren GdkPixbuf * gtk_source_gutter_renderer_pixbuf_get_pixbuf (GtkSourceGutterRendererPixbuf *renderer) { + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL); - return gtk_source_pixbuf_helper_get_pixbuf (renderer->priv->helper); + return gtk_source_pixbuf_helper_get_pixbuf (priv->helper); } /** @@ -412,9 +418,11 @@ gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *rend GIcon * gtk_source_gutter_renderer_pixbuf_get_gicon (GtkSourceGutterRendererPixbuf *renderer) { + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL); - return gtk_source_pixbuf_helper_get_gicon (renderer->priv->helper); + return gtk_source_pixbuf_helper_get_gicon (priv->helper); } /** @@ -434,7 +442,9 @@ gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf * const gchar * gtk_source_gutter_renderer_pixbuf_get_icon_name (GtkSourceGutterRendererPixbuf *renderer) { + GtkSourceGutterRendererPixbufPrivate *priv = gtk_source_gutter_renderer_pixbuf_get_instance_private (renderer); + g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL); - return gtk_source_pixbuf_helper_get_icon_name (renderer->priv->helper); + return gtk_source_pixbuf_helper_get_icon_name (priv->helper); } diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h index b34f4dda..a506edf7 100644 --- a/gtksourceview/gtksourcegutterrendererpixbuf.h +++ b/gtksourceview/gtksourcegutterrendererpixbuf.h @@ -29,60 +29,35 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF (gtk_source_gutter_renderer_pixbuf_get_type ()) -#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbuf)) -#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbuf const)) -#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass)) -#define GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF)) -#define GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF)) -#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass)) +#define GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF (gtk_source_gutter_renderer_pixbuf_get_type()) -typedef struct _GtkSourceGutterRendererPixbufClass GtkSourceGutterRendererPixbufClass; -typedef struct _GtkSourceGutterRendererPixbufPrivate GtkSourceGutterRendererPixbufPrivate; - -struct _GtkSourceGutterRendererPixbuf -{ - /*< private >*/ - GtkSourceGutterRenderer parent; - - GtkSourceGutterRendererPixbufPrivate *priv; - - /*< public >*/ -}; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourceGutterRendererPixbuf, gtk_source_gutter_renderer_pixbuf, GTK_SOURCE, GUTTER_RENDERER_PIXBUF, GtkSourceGutterRenderer) struct _GtkSourceGutterRendererPixbufClass { - /*< private >*/ GtkSourceGutterRendererClass parent_class; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_gutter_renderer_pixbuf_get_type (void) G_GNUC_CONST; - -GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceGutterRenderer *gtk_source_gutter_renderer_pixbuf_new (void); - +GtkSourceGutterRenderer *gtk_source_gutter_renderer_pixbuf_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *renderer, - GdkPixbuf *pixbuf); - +void gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *renderer, + GdkPixbuf *pixbuf); GTK_SOURCE_AVAILABLE_IN_ALL -GdkPixbuf *gtk_source_gutter_renderer_pixbuf_get_pixbuf (GtkSourceGutterRendererPixbuf *renderer); - +GdkPixbuf *gtk_source_gutter_renderer_pixbuf_get_pixbuf (GtkSourceGutterRendererPixbuf *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *renderer, - GIcon *icon); - +void gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *renderer, + GIcon *icon); GTK_SOURCE_AVAILABLE_IN_ALL -GIcon *gtk_source_gutter_renderer_pixbuf_get_gicon (GtkSourceGutterRendererPixbuf *renderer); - +GIcon *gtk_source_gutter_renderer_pixbuf_get_gicon (GtkSourceGutterRendererPixbuf *renderer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf *renderer, - const gchar *icon_name); - +void gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf *renderer, + const gchar *icon_name); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_gutter_renderer_pixbuf_get_icon_name (GtkSourceGutterRendererPixbuf *renderer); +const gchar *gtk_source_gutter_renderer_pixbuf_get_icon_name (GtkSourceGutterRendererPixbuf *renderer); G_END_DECLS -- GitLab From 8756edd244b4a42b489fd02fef27d3e7103c5682 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 Jan 2020 20:49:44 -0800 Subject: [PATCH 019/248] gutter: modernize GtkSourceGutterRendererText - Use G_DECLARE_ macros - Use get_instance_private - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcegutterrenderertext.c | 75 +++++++++++---------- gtksourceview/gtksourcegutterrenderertext.h | 61 ++++++----------- 3 files changed, 59 insertions(+), 78 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index c1a35a70..eccb6f8e 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceGutterRendererText, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguage, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguageManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMark, g_object_unref) diff --git a/gtksourceview/gtksourcegutterrenderertext.c b/gtksourceview/gtksourcegutterrenderertext.c index 2c413289..c8085afe 100644 --- a/gtksourceview/gtksourcegutterrenderertext.c +++ b/gtksourceview/gtksourcegutterrenderertext.c @@ -32,14 +32,14 @@ * #GtkSourceGutter. */ -struct _GtkSourceGutterRendererTextPrivate +typedef struct { gchar *text; PangoLayout *cached_layout; guint is_markup : 1; -}; +} GtkSourceGutterRendererTextPrivate; G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceGutterRendererText, gtk_source_gutter_renderer_text, GTK_SOURCE_TYPE_GUTTER_RENDERER) @@ -52,19 +52,20 @@ enum static void gutter_renderer_text_begin (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end) + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end) { GtkSourceGutterRendererText *text = GTK_SOURCE_GUTTER_RENDERER_TEXT (renderer); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (text); GtkTextView *view; view = gtk_source_gutter_renderer_get_view (renderer); - g_clear_object (&text->priv->cached_layout); - text->priv->cached_layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL); + g_clear_object (&priv->cached_layout); + priv->cached_layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL); if (GTK_SOURCE_GUTTER_RENDERER_CLASS (gtk_source_gutter_renderer_text_parent_class)->begin != NULL) { @@ -98,14 +99,15 @@ center_on (GtkTextView *view, static void gutter_renderer_text_draw (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceGutterRendererState state) + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end, + GtkSourceGutterRendererState state) { GtkSourceGutterRendererText *text = GTK_SOURCE_GUTTER_RENDERER_TEXT (renderer); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (text); GtkTextView *view; gint width; gint height; @@ -130,20 +132,20 @@ gutter_renderer_text_draw (GtkSourceGutterRenderer *renderer, view = gtk_source_gutter_renderer_get_view (renderer); - if (text->priv->is_markup) + if (priv->is_markup) { - pango_layout_set_markup (text->priv->cached_layout, - text->priv->text, + pango_layout_set_markup (priv->cached_layout, + priv->text, -1); } else { - pango_layout_set_text (text->priv->cached_layout, - text->priv->text, + pango_layout_set_text (priv->cached_layout, + priv->text, -1); } - pango_layout_get_pixel_size (text->priv->cached_layout, &width, &height); + pango_layout_get_pixel_size (priv->cached_layout, &width, &height); gtk_source_gutter_renderer_get_alignment (renderer, &xalign, @@ -195,15 +197,16 @@ gutter_renderer_text_draw (GtkSourceGutterRenderer *renderer, } context = gtk_widget_get_style_context (GTK_WIDGET (view)); - gtk_render_layout (context, cr, x, y, text->priv->cached_layout); + gtk_render_layout (context, cr, x, y, priv->cached_layout); } static void gutter_renderer_text_end (GtkSourceGutterRenderer *renderer) { GtkSourceGutterRendererText *text = GTK_SOURCE_GUTTER_RENDERER_TEXT (renderer); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (text); - g_clear_object (&text->priv->cached_layout); + g_clear_object (&priv->cached_layout); if (GTK_SOURCE_GUTTER_RENDERER_CLASS (gtk_source_gutter_renderer_text_parent_class)->end != NULL) { @@ -291,9 +294,10 @@ static void gtk_source_gutter_renderer_text_finalize (GObject *object) { GtkSourceGutterRendererText *renderer = GTK_SOURCE_GUTTER_RENDERER_TEXT (object); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (renderer); - g_free (renderer->priv->text); - g_clear_object (&renderer->priv->cached_layout); + g_free (priv->text); + g_clear_object (&priv->cached_layout); G_OBJECT_CLASS (gtk_source_gutter_renderer_text_parent_class)->finalize (object); } @@ -304,10 +308,12 @@ set_text (GtkSourceGutterRendererText *renderer, gint length, gboolean is_markup) { - g_free (renderer->priv->text); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (renderer); + + g_free (priv->text); - renderer->priv->text = length >= 0 ? g_strndup (text, length) : g_strdup (text); - renderer->priv->is_markup = is_markup; + priv->text = length >= 0 ? g_strndup (text, length) : g_strdup (text); + priv->is_markup = is_markup; } static void @@ -340,17 +346,16 @@ gtk_source_gutter_renderer_text_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GtkSourceGutterRendererText *renderer; - - renderer = GTK_SOURCE_GUTTER_RENDERER_TEXT (object); + GtkSourceGutterRendererText *renderer = GTK_SOURCE_GUTTER_RENDERER_TEXT (object); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (renderer); switch (prop_id) { case PROP_MARKUP: - g_value_set_string (value, renderer->priv->is_markup ? renderer->priv->text : NULL); + g_value_set_string (value, priv->is_markup ? priv->text : NULL); break; case PROP_TEXT: - g_value_set_string (value, !renderer->priv->is_markup ? renderer->priv->text : NULL); + g_value_set_string (value, !priv->is_markup ? priv->text : NULL); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -393,9 +398,9 @@ gtk_source_gutter_renderer_text_class_init (GtkSourceGutterRendererTextClass *kl static void gtk_source_gutter_renderer_text_init (GtkSourceGutterRendererText *self) { - self->priv = gtk_source_gutter_renderer_text_get_instance_private (self); + GtkSourceGutterRendererTextPrivate *priv = gtk_source_gutter_renderer_text_get_instance_private (self); - self->priv->is_markup = TRUE; + priv->is_markup = TRUE; } /** diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h index c9c91812..59efe60f 100644 --- a/gtksourceview/gtksourcegutterrenderertext.h +++ b/gtksourceview/gtksourcegutterrenderertext.h @@ -29,61 +29,38 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT (gtk_source_gutter_renderer_text_get_type ()) -#define GTK_SOURCE_GUTTER_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererText)) -#define GTK_SOURCE_GUTTER_RENDERER_TEXT_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererText const)) -#define GTK_SOURCE_GUTTER_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass)) -#define GTK_SOURCE_IS_GUTTER_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT)) -#define GTK_SOURCE_IS_GUTTER_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT)) -#define GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass)) - -typedef struct _GtkSourceGutterRendererTextClass GtkSourceGutterRendererTextClass; -typedef struct _GtkSourceGutterRendererTextPrivate GtkSourceGutterRendererTextPrivate; - -struct _GtkSourceGutterRendererText -{ - /*< private >*/ - GtkSourceGutterRenderer parent; - - GtkSourceGutterRendererTextPrivate *priv; - - /*< public >*/ -}; +#define GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT (gtk_source_gutter_renderer_text_get_type()) struct _GtkSourceGutterRendererTextClass { - /*< private >*/ GtkSourceGutterRendererClass parent_class; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_gutter_renderer_text_get_type (void) G_GNUC_CONST; +G_DECLARE_DERIVABLE_TYPE (GtkSourceGutterRendererText, gtk_source_gutter_renderer_text, GTK_SOURCE, GUTTER_RENDERER_TEXT, GtkSourceGutterRenderer) GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceGutterRenderer *gtk_source_gutter_renderer_text_new (void); - +GtkSourceGutterRenderer *gtk_source_gutter_renderer_text_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_text_set_markup (GtkSourceGutterRendererText *renderer, - const gchar *markup, - gint length); - +void gtk_source_gutter_renderer_text_set_markup (GtkSourceGutterRendererText *renderer, + const gchar *markup, + gint length); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_text_set_text (GtkSourceGutterRendererText *renderer, - const gchar *text, - gint length); - +void gtk_source_gutter_renderer_text_set_text (GtkSourceGutterRendererText *renderer, + const gchar *text, + gint length); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_text_measure (GtkSourceGutterRendererText *renderer, - const gchar *text, - gint *width, - gint *height); - +void gtk_source_gutter_renderer_text_measure (GtkSourceGutterRendererText *renderer, + const gchar *text, + gint *width, + gint *height); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_gutter_renderer_text_measure_markup (GtkSourceGutterRendererText *renderer, - const gchar *markup, - gint *width, - gint *height); +void gtk_source_gutter_renderer_text_measure_markup (GtkSourceGutterRendererText *renderer, + const gchar *markup, + gint *width, + gint *height); G_END_DECLS -- GitLab From b0925f35971661de1794a4700e690f4a23ef04a2 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 09:17:53 -0800 Subject: [PATCH 020/248] language: modernize GtkSourceLanguage - Use G_DECLARE_ macros - Make object final - Use get_instance_private - Fix spacing style for multi-line functions - Remove use of private data from external modules --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcecontextengine.c | 18 +- gtksourceview/gtksourcelanguage-parser-2.c | 26 ++- gtksourceview/gtksourcelanguage-private.h | 80 +++---- gtksourceview/gtksourcelanguage.c | 243 +++++++++++++-------- gtksourceview/gtksourcelanguage.h | 63 ++---- gtksourceview/gtksourcelanguagemanager.c | 9 +- 7 files changed, 219 insertions(+), 221 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index eccb6f8e..67d113ac 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguage, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguageManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMark, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMap, g_object_unref) diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c index f7355ea6..33ddfc42 100644 --- a/gtksourceview/gtksourcecontextengine.c +++ b/gtksourceview/gtksourcecontextengine.c @@ -2784,9 +2784,8 @@ _gtk_source_context_data_unref (GtkSourceContextData *ctx_data) if (--ctx_data->ref_count == 0) { - if (ctx_data->lang != NULL && ctx_data->lang->priv != NULL && - ctx_data->lang->priv->ctx_data == ctx_data) - ctx_data->lang->priv->ctx_data = NULL; + if (ctx_data->lang != NULL) + _gtk_source_language_clear_ctx_data (ctx_data->lang, ctx_data); g_hash_table_destroy (ctx_data->definitions); g_slice_free (GtkSourceContextData, ctx_data); } @@ -6086,7 +6085,7 @@ _gtk_source_context_data_add_ref (GtkSourceContextData *ctx_data, GTK_SOURCE_CONTEXT_ENGINE_ERROR_INVALID_STYLE, _("style override used with wildcard context reference" " in language “%s” in ref “%s”"), - ctx_data->lang->priv->id, ref_id); + gtk_source_language_get_id (ctx_data->lang), ref_id); return FALSE; } @@ -6146,7 +6145,7 @@ resolve_reference (G_GNUC_UNUSED const gchar *id, GTK_SOURCE_CONTEXT_ENGINE_ERROR_INVALID_STYLE, _("style override used with wildcard context reference" " in language “%s” in ref “%s”"), - data->ctx_data->lang->priv->id, ref->id); + gtk_source_language_get_id (data->ctx_data->lang), ref->id); } else { @@ -6278,7 +6277,9 @@ _gtk_source_context_data_finish_parse (GtkSourceContextData *ctx_data, } /* Sanity check: user may have screwed up the files by now (#485661) */ - root_id = g_strdup_printf ("%s:%s", ctx_data->lang->priv->id, ctx_data->lang->priv->id); + root_id = g_strdup_printf ("%s:%s", + gtk_source_language_get_id (ctx_data->lang), + gtk_source_language_get_id (ctx_data->lang)); main_definition = gtk_source_context_data_lookup (ctx_data, root_id); g_free (root_id); @@ -6286,9 +6287,8 @@ _gtk_source_context_data_finish_parse (GtkSourceContextData *ctx_data, { g_set_error (error, GTK_SOURCE_CONTEXT_ENGINE_ERROR, GTK_SOURCE_CONTEXT_ENGINE_ERROR_BAD_FILE, - _("Missing main language " - "definition (id = \"%s\".)"), - ctx_data->lang->priv->id); + _("Missing main language definition (id = “%s”.)"), + gtk_source_language_get_id (ctx_data->lang)); return FALSE; } diff --git a/gtksourceview/gtksourcelanguage-parser-2.c b/gtksourceview/gtksourcelanguage-parser-2.c index 1ef2a09c..c0933435 100644 --- a/gtksourceview/gtksourcelanguage-parser-2.c +++ b/gtksourceview/gtksourcelanguage-parser-2.c @@ -135,7 +135,7 @@ static ParserState *parser_state_new (GtkSourceLanguage *language GHashTable *loaded_lang_ids); static void parser_state_destroy (ParserState *parser_state); -static gboolean file_parse (gchar *filename, +static gboolean file_parse (const gchar *filename, GtkSourceLanguage *language, GtkSourceContextData *ctx_data, GHashTable *defined_regexes, @@ -577,7 +577,7 @@ add_ref (ParserState *parser_state, } else { - file_parse (imported_language->priv->lang_file_name, + file_parse (_gtk_source_language_get_file_name (imported_language), parser_state->language, parser_state->ctx_data, parser_state->defined_regexes, @@ -591,8 +591,8 @@ add_ref (ParserState *parser_state, GError *tmp_error2 = NULL; g_set_error (&tmp_error2, PARSER_ERROR, tmp_error->code, "In file '%s' referenced from '%s': %s", - imported_language->priv->lang_file_name, - parser_state->language->priv->lang_file_name, + _gtk_source_language_get_file_name (imported_language), + _gtk_source_language_get_file_name (parser_state->language), tmp_error->message); g_clear_error (&tmp_error); tmp_error = tmp_error2; @@ -1355,7 +1355,7 @@ parse_language_with_id (ParserState *parser_state, } else { - file_parse (imported_language->priv->lang_file_name, + file_parse (_gtk_source_language_get_file_name (imported_language), parser_state->language, parser_state->ctx_data, parser_state->defined_regexes, @@ -1594,7 +1594,7 @@ text_reader_structured_error_func (ParserState *parser_state, } static gboolean -file_parse (gchar *filename, +file_parse (const gchar *filename, GtkSourceLanguage *language, GtkSourceContextData *ctx_data, GHashTable *defined_regexes, @@ -1720,13 +1720,17 @@ parser_state_new (GtkSourceLanguage *language, GHashTable *loaded_lang_ids) { ParserState *parser_state; + const gchar *id; + + id = gtk_source_language_get_id (language); + g_return_val_if_fail (id != NULL, NULL); + parser_state = g_slice_new0 (ParserState); parser_state->language = language; parser_state->ctx_data = ctx_data; - g_return_val_if_fail (language->priv->id != NULL, NULL); - parser_state->language_decoration = g_strdup_printf ("%s:", language->priv->id); + parser_state->language_decoration = g_strdup_printf ("%s:", id); parser_state->current_lang_id = NULL; @@ -1787,13 +1791,13 @@ _gtk_source_language_file_parse_version2 (GtkSourceLanguage *language, GHashTable *defined_regexes, *styles; gboolean success; GError *error = NULL; - gchar *filename; + const gchar *filename; GHashTable *loaded_lang_ids; GQueue *replacements; g_return_val_if_fail (ctx_data != NULL, FALSE); - filename = language->priv->lang_file_name; + filename = _gtk_source_language_get_file_name (language); /* TODO: as an optimization tell the parser to merge CDATA * as text nodes (XML_PARSE_NOCDATA), and to ignore blank @@ -1826,7 +1830,7 @@ _gtk_source_language_file_parse_version2 (GtkSourceLanguage *language, if (success) g_hash_table_foreach_steal (styles, (GHRFunc) steal_styles_mapping, - language->priv->styles); + _gtk_source_language_get_styles (language)); g_queue_free_full (replacements, (GDestroyNotify) _gtk_source_context_replace_free); g_hash_table_destroy (loaded_lang_ids); diff --git a/gtksourceview/gtksourcelanguage-private.h b/gtksourceview/gtksourcelanguage-private.h index 061fae5a..c35efb35 100644 --- a/gtksourceview/gtksourcelanguage-private.h +++ b/gtksourceview/gtksourcelanguage-private.h @@ -21,79 +21,51 @@ #pragma once #include + #include "gtksourcecontextengine.h" #include "gtksourcelanguagemanager.h" G_BEGIN_DECLS -#define GTK_SOURCE_LANGUAGE_VERSION_1_0 100 -#define GTK_SOURCE_LANGUAGE_VERSION_2_0 200 - -typedef struct _GtkSourceStyleInfo GtkSourceStyleInfo; +#define GTK_SOURCE_LANGUAGE_VERSION_1_0 100 +#define GTK_SOURCE_LANGUAGE_VERSION_2_0 200 -struct _GtkSourceStyleInfo +typedef struct { gchar *name; gchar *map_to; -}; - -struct _GtkSourceLanguagePrivate -{ - gchar *lang_file_name; - gchar *translation_domain; - - gchar *id; - gchar *name; - gchar *section; - - /* Maps ids to GtkSourceStyleInfo objects */ - /* Names of styles defined in other lang files are not stored */ - GHashTable *styles; - gboolean styles_loaded; - - gint version; - gboolean hidden; - - GHashTable *properties; - - GtkSourceLanguageManager *language_manager; - - GtkSourceContextData *ctx_data; -}; +} GtkSourceStyleInfo; G_GNUC_INTERNAL -GtkSourceLanguage *_gtk_source_language_new_from_file (const gchar *filename, - GtkSourceLanguageManager *lm); - +GtkSourceLanguage *_gtk_source_language_new_from_file (const gchar *filename, + GtkSourceLanguageManager *lm); G_GNUC_INTERNAL -GtkSourceLanguageManager *_gtk_source_language_get_language_manager (GtkSourceLanguage *language); - +GtkSourceLanguageManager *_gtk_source_language_get_language_manager (GtkSourceLanguage *language); G_GNUC_INTERNAL -const gchar *_gtk_source_language_manager_get_rng_file (GtkSourceLanguageManager *lm); - +const gchar *_gtk_source_language_get_file_name (GtkSourceLanguage *language); G_GNUC_INTERNAL -gchar *_gtk_source_language_translate_string (GtkSourceLanguage *language, - const gchar *string); - +const gchar *_gtk_source_language_manager_get_rng_file (GtkSourceLanguageManager *lm); G_GNUC_INTERNAL -void _gtk_source_language_define_language_styles (GtkSourceLanguage *language); - +gchar *_gtk_source_language_translate_string (GtkSourceLanguage *language, + const gchar *string); G_GNUC_INTERNAL -gboolean _gtk_source_language_file_parse_version2 (GtkSourceLanguage *language, - GtkSourceContextData *ctx_data); - +void _gtk_source_language_define_language_styles (GtkSourceLanguage *language); G_GNUC_INTERNAL -GtkSourceEngine *_gtk_source_language_create_engine (GtkSourceLanguage *language); - -/* Utility functions for GtkSourceStyleInfo */ +gboolean _gtk_source_language_file_parse_version2 (GtkSourceLanguage *language, + GtkSourceContextData *ctx_data); G_GNUC_INTERNAL -GtkSourceStyleInfo *_gtk_source_style_info_new (const gchar *name, - const gchar *map_to); - +GtkSourceEngine *_gtk_source_language_create_engine (GtkSourceLanguage *language); G_GNUC_INTERNAL -GtkSourceStyleInfo *_gtk_source_style_info_copy (GtkSourceStyleInfo *info); - +void _gtk_source_language_clear_ctx_data (GtkSourceLanguage *language, + GtkSourceContextData *ctx_data); +G_GNUC_INTERNAL +GHashTable *_gtk_source_language_get_styles (GtkSourceLanguage *language); +G_GNUC_INTERNAL +GtkSourceStyleInfo *_gtk_source_style_info_new (const gchar *name, + const gchar *map_to); +G_GNUC_INTERNAL +GtkSourceStyleInfo *_gtk_source_style_info_copy (GtkSourceStyleInfo *info); G_GNUC_INTERNAL -void _gtk_source_style_info_free (GtkSourceStyleInfo *info); +void _gtk_source_style_info_free (GtkSourceStyleInfo *info); G_END_DECLS diff --git a/gtksourceview/gtksourcelanguage.c b/gtksourceview/gtksourcelanguage.c index 0391c9fd..b68c08da 100644 --- a/gtksourceview/gtksourcelanguage.c +++ b/gtksourceview/gtksourcelanguage.c @@ -61,15 +61,41 @@ enum { PROP_HIDDEN }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceLanguage, gtk_source_language, G_TYPE_OBJECT) +struct _GtkSourceLanguage +{ + GObject parent_instance; + + gchar *lang_file_name; + gchar *translation_domain; + + gchar *id; + gchar *name; + gchar *section; + + /* Maps ids to GtkSourceStyleInfo objects */ + /* Names of styles defined in other lang files are not stored */ + GHashTable *styles; + gboolean styles_loaded; -static GtkSourceLanguage *process_language_node (xmlTextReaderPtr reader, - const gchar *filename); -static gboolean force_styles (GtkSourceLanguage *language); + gint version; + gboolean hidden; + + GHashTable *properties; + + GtkSourceLanguageManager *language_manager; + + GtkSourceContextData *ctx_data; +}; + +G_DEFINE_TYPE (GtkSourceLanguage, gtk_source_language, G_TYPE_OBJECT) + +static GtkSourceLanguage *process_language_node (xmlTextReaderPtr reader, + const gchar *filename); +static gboolean force_styles (GtkSourceLanguage *language); GtkSourceLanguage * _gtk_source_language_new_from_file (const gchar *filename, - GtkSourceLanguageManager *lm) + GtkSourceLanguageManager *lm) { GtkSourceLanguage *lang = NULL; xmlTextReaderPtr reader = NULL; @@ -132,9 +158,9 @@ _gtk_source_language_new_from_file (const gchar *filename, if (lang != NULL) { - lang->priv->language_manager = lm; + lang->language_manager = lm; g_object_add_weak_pointer (G_OBJECT (lm), - (gpointer) &lang->priv->language_manager); + (gpointer) &lang->language_manager); } return lang; @@ -142,9 +168,9 @@ _gtk_source_language_new_from_file (const gchar *filename, static void gtk_source_language_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceLanguage *language; @@ -155,19 +181,19 @@ gtk_source_language_get_property (GObject *object, switch (prop_id) { case PROP_ID: - g_value_set_string (value, language->priv->id); + g_value_set_string (value, language->id); break; case PROP_NAME: - g_value_set_string (value, language->priv->name); + g_value_set_string (value, language->name); break; case PROP_SECTION: - g_value_set_string (value, language->priv->section); + g_value_set_string (value, language->section); break; case PROP_HIDDEN: - g_value_set_boolean (value, language->priv->hidden); + g_value_set_boolean (value, language->hidden); break; default: @@ -183,11 +209,11 @@ gtk_source_language_dispose (GObject *object) lang = GTK_SOURCE_LANGUAGE (object); - if (lang->priv->language_manager != NULL) + if (lang->language_manager != NULL) { - g_object_remove_weak_pointer (G_OBJECT (lang->priv->language_manager), - (gpointer) &lang->priv->language_manager); - lang->priv->language_manager = NULL; + g_object_remove_weak_pointer (G_OBJECT (lang->language_manager), + (gpointer) &lang->language_manager); + lang->language_manager = NULL; } G_OBJECT_CLASS (gtk_source_language_parent_class)->dispose (object); @@ -200,17 +226,17 @@ gtk_source_language_finalize (GObject *object) lang = GTK_SOURCE_LANGUAGE (object); - if (lang->priv->ctx_data != NULL) + if (lang->ctx_data != NULL) g_critical ("context data not freed in gtk_source_language_finalize"); - g_free (lang->priv->lang_file_name); - g_free (lang->priv->translation_domain); - g_free (lang->priv->name); - g_free (lang->priv->section); - g_free (lang->priv->id); - g_hash_table_destroy (lang->priv->properties); + g_free (lang->lang_file_name); + g_free (lang->translation_domain); + g_free (lang->name); + g_free (lang->section); + g_free (lang->id); + g_hash_table_destroy (lang->properties); - g_hash_table_destroy (lang->priv->styles); + g_hash_table_destroy (lang->styles); G_OBJECT_CLASS (gtk_source_language_parent_class)->finalize (object); } @@ -264,13 +290,13 @@ gtk_source_language_class_init (GtkSourceLanguageClass *klass) static void gtk_source_language_init (GtkSourceLanguage *lang) { - lang->priv = gtk_source_language_get_instance_private (lang); + lang = gtk_source_language_get_instance_private (lang); - lang->priv->styles = g_hash_table_new_full (g_str_hash, + lang->styles = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)_gtk_source_style_info_free); - lang->priv->properties = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + lang->properties = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); } static gboolean @@ -290,7 +316,7 @@ string_to_bool (const gchar *string) static void process_properties (xmlTextReaderPtr reader, - GtkSourceLanguage *language) + GtkSourceLanguage *language) { xmlNodePtr child; xmlNodePtr node = NULL; @@ -334,7 +360,7 @@ process_properties (xmlTextReaderPtr reader, content = xmlNodeGetContent (child); if (name != NULL && content != NULL) - g_hash_table_insert (language->priv->properties, + g_hash_table_insert (language->properties, g_strdup ((gchar *) name), g_strdup ((gchar *) content)); @@ -344,7 +370,8 @@ process_properties (xmlTextReaderPtr reader, } static GtkSourceLanguage * -process_language_node (xmlTextReaderPtr reader, const gchar *filename) +process_language_node (xmlTextReaderPtr reader, + const gchar *filename) { xmlChar *version; xmlChar *tmp; @@ -353,29 +380,29 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename) lang = g_object_new (GTK_SOURCE_TYPE_LANGUAGE, NULL); - lang->priv->lang_file_name = g_strdup (filename); + lang->lang_file_name = g_strdup (filename); tmp = xmlTextReaderGetAttribute (reader, BAD_CAST "translation-domain"); - lang->priv->translation_domain = g_strdup ((gchar*) tmp); + lang->translation_domain = g_strdup ((gchar*) tmp); xmlFree (tmp); tmp = xmlTextReaderGetAttribute (reader, BAD_CAST "hidden"); if (tmp != NULL) - lang->priv->hidden = string_to_bool ((gchar*) tmp); + lang->hidden = string_to_bool ((gchar*) tmp); else - lang->priv->hidden = FALSE; + lang->hidden = FALSE; xmlFree (tmp); tmp = xmlTextReaderGetAttribute (reader, BAD_CAST "mimetypes"); if (tmp != NULL) - g_hash_table_insert (lang->priv->properties, + g_hash_table_insert (lang->properties, g_strdup ("mimetypes"), g_strdup ((char*) tmp)); xmlFree (tmp); tmp = xmlTextReaderGetAttribute (reader, BAD_CAST "globs"); if (tmp != NULL) - g_hash_table_insert (lang->priv->properties, + g_hash_table_insert (lang->properties, g_strdup ("globs"), g_strdup ((char*) tmp)); xmlFree (tmp); @@ -393,23 +420,23 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename) return NULL; } - lang->priv->name = g_strdup ((char*) tmp); + lang->name = g_strdup ((char*) tmp); untranslated_name = tmp; } else { - lang->priv->name = _gtk_source_language_translate_string (lang, (gchar*) tmp); + lang->name = _gtk_source_language_translate_string (lang, (gchar*) tmp); untranslated_name = tmp; } tmp = xmlTextReaderGetAttribute (reader, BAD_CAST "id"); if (tmp != NULL) { - lang->priv->id = g_ascii_strdown ((gchar*) tmp, -1); + lang->id = g_ascii_strdown ((gchar*) tmp, -1); } else { - lang->priv->id = g_ascii_strdown ((gchar*) untranslated_name, -1); + lang->id = g_ascii_strdown ((gchar*) untranslated_name, -1); } xmlFree (tmp); xmlFree (untranslated_name); @@ -420,15 +447,15 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename) tmp = xmlTextReaderGetAttribute (reader, BAD_CAST "section"); if (tmp == NULL) - lang->priv->section = g_strdup (DEFAULT_SECTION); + lang->section = g_strdup (DEFAULT_SECTION); else - lang->priv->section = g_strdup ((gchar *) tmp); + lang->section = g_strdup ((gchar *) tmp); xmlFree (tmp); } else { - lang->priv->section = _gtk_source_language_translate_string (lang, (gchar*) tmp); + lang->section = _gtk_source_language_translate_string (lang, (gchar*) tmp); xmlFree (tmp); } @@ -444,11 +471,11 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename) if (xmlStrcmp (version , BAD_CAST "1.0") == 0) { - lang->priv->version = GTK_SOURCE_LANGUAGE_VERSION_1_0; + lang->version = GTK_SOURCE_LANGUAGE_VERSION_1_0; } else if (xmlStrcmp (version, BAD_CAST "2.0") == 0) { - lang->priv->version = GTK_SOURCE_LANGUAGE_VERSION_2_0; + lang->version = GTK_SOURCE_LANGUAGE_VERSION_2_0; } else { @@ -461,7 +488,7 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename) xmlFree (version); - if (lang->priv->version == GTK_SOURCE_LANGUAGE_VERSION_2_0) + if (lang->version == GTK_SOURCE_LANGUAGE_VERSION_2_0) process_properties (reader, lang); return lang; @@ -469,11 +496,11 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename) gchar * _gtk_source_language_translate_string (GtkSourceLanguage *language, - const gchar *string) + const gchar *string) { g_return_val_if_fail (string != NULL, NULL); - return _gtk_source_utils_dgettext (language->priv->translation_domain, string); + return _gtk_source_utils_dgettext (language->translation_domain, string); } /** @@ -490,9 +517,9 @@ const gchar * gtk_source_language_get_id (GtkSourceLanguage *language) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->id != NULL, NULL); + g_return_val_if_fail (language->id != NULL, NULL); - return language->priv->id; + return language->id; } /** @@ -509,9 +536,9 @@ const gchar * gtk_source_language_get_name (GtkSourceLanguage *language) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->name != NULL, NULL); + g_return_val_if_fail (language->name != NULL, NULL); - return language->priv->name; + return language->name; } /** @@ -527,12 +554,12 @@ gtk_source_language_get_name (GtkSourceLanguage *language) * Returns: the section of @language. **/ const gchar * -gtk_source_language_get_section (GtkSourceLanguage *language) +gtk_source_language_get_section (GtkSourceLanguage *language) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->section != NULL, NULL); + g_return_val_if_fail (language->section != NULL, NULL); - return language->priv->section; + return language->section; } /** @@ -548,7 +575,7 @@ gtk_source_language_get_hidden (GtkSourceLanguage *language) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), FALSE); - return language->priv->hidden; + return language->hidden; } /** @@ -564,12 +591,12 @@ gtk_source_language_get_hidden (GtkSourceLanguage *language) **/ const gchar * gtk_source_language_get_metadata (GtkSourceLanguage *language, - const gchar *name) + const gchar *name) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); g_return_val_if_fail (name != NULL, NULL); - return g_hash_table_lookup (language->priv->properties, name); + return g_hash_table_lookup (language->properties, name); } /** @@ -637,17 +664,17 @@ GtkSourceLanguageManager * _gtk_source_language_get_language_manager (GtkSourceLanguage *language) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->id != NULL, NULL); + g_return_val_if_fail (language->id != NULL, NULL); - return language->priv->language_manager; + return language->language_manager; } /* Highlighting engine creation ------------------------------------------ */ static void copy_style_info (const char *style_id, - GtkSourceStyleInfo *info, - GHashTable *dest) + GtkSourceStyleInfo *info, + GHashTable *dest) { g_hash_table_insert (dest, g_strdup (style_id), _gtk_source_style_info_copy (info)); @@ -680,7 +707,7 @@ _gtk_source_language_define_language_styles (GtkSourceLanguage *lang) info = _gtk_source_style_info_new (alias[i][0], alias[i][1]); - g_hash_table_insert (lang->priv->styles, + g_hash_table_insert (lang->styles, g_strdup (alias[i][0]), info); @@ -696,9 +723,9 @@ _gtk_source_language_define_language_styles (GtkSourceLanguage *lang) if (def_lang != NULL) { force_styles (def_lang); - g_hash_table_foreach (def_lang->priv->styles, + g_hash_table_foreach (def_lang->styles, (GHFunc) copy_style_info, - lang->priv->styles); + lang->styles); } } @@ -706,12 +733,12 @@ _gtk_source_language_define_language_styles (GtkSourceLanguage *lang) static GtkSourceContextData * gtk_source_language_parse_file (GtkSourceLanguage *language) { - if (language->priv->ctx_data == NULL) + if (language->ctx_data == NULL) { gboolean success = FALSE; GtkSourceContextData *ctx_data; - if (language->priv->language_manager == NULL) + if (language->language_manager == NULL) { g_critical ("_gtk_source_language_create_engine() is called after " "language manager was finalized"); @@ -720,7 +747,7 @@ gtk_source_language_parse_file (GtkSourceLanguage *language) { ctx_data = _gtk_source_context_data_new (language); - switch (language->priv->version) + switch (language->version) { case GTK_SOURCE_LANGUAGE_VERSION_1_0: g_warning ("The language definition format version 1 " @@ -740,15 +767,15 @@ gtk_source_language_parse_file (GtkSourceLanguage *language) if (!success) _gtk_source_context_data_unref (ctx_data); else - language->priv->ctx_data = ctx_data; + language->ctx_data = ctx_data; } } else { - _gtk_source_context_data_ref (language->priv->ctx_data); + _gtk_source_context_data_ref (language->ctx_data); } - return language->priv->ctx_data; + return language->ctx_data; } GtkSourceEngine * @@ -768,16 +795,16 @@ _gtk_source_language_create_engine (GtkSourceLanguage *language) return ce ? GTK_SOURCE_ENGINE (ce) : NULL; } -typedef struct _AddStyleIdData AddStyleIdData; - -struct _AddStyleIdData +typedef struct { - gchar *language_id; - GPtrArray *ids_array; -}; + gchar *language_id; + GPtrArray *ids_array; +} AddStyleIdData; static void -add_style_id (gchar *id, G_GNUC_UNUSED gpointer value, AddStyleIdData *data) +add_style_id (gchar *id, + G_GNUC_UNUSED gpointer value, + AddStyleIdData *data) { if (g_str_has_prefix (id, data->language_id)) g_ptr_array_add (data->ids_array, g_strdup (id)); @@ -789,14 +816,14 @@ get_style_ids (GtkSourceLanguage *language) GPtrArray *ids_array; AddStyleIdData data; - g_return_val_if_fail (language->priv->styles != NULL, NULL); + g_return_val_if_fail (language->styles != NULL, NULL); ids_array = g_ptr_array_new (); - data.language_id = g_strdup_printf ("%s:", language->priv->id); + data.language_id = g_strdup_printf ("%s:", language->id); data.ids_array = ids_array; - g_hash_table_foreach (language->priv->styles, + g_hash_table_foreach (language->styles, (GHFunc) add_style_id, &data); @@ -825,7 +852,7 @@ force_styles (GtkSourceLanguage *language) * as if we were to create an engine. In the future we can improve * this by parsing styles only. */ - if (!language->priv->styles_loaded && language->priv->ctx_data == NULL) + if (!language->styles_loaded && language->ctx_data == NULL) { GtkSourceContextData *ctx_data; @@ -833,7 +860,7 @@ force_styles (GtkSourceLanguage *language) if (ctx_data == NULL) return FALSE; - language->priv->styles_loaded = TRUE; + language->styles_loaded = TRUE; _gtk_source_context_data_unref (ctx_data); } @@ -855,7 +882,7 @@ gchar ** gtk_source_language_get_style_ids (GtkSourceLanguage *language) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->id != NULL, NULL); + g_return_val_if_fail (language->id != NULL, NULL); if (!force_styles (language)) return NULL; @@ -864,16 +891,17 @@ gtk_source_language_get_style_ids (GtkSourceLanguage *language) } static GtkSourceStyleInfo * -get_style_info (GtkSourceLanguage *language, const char *style_id) +get_style_info (GtkSourceLanguage *language, + const char *style_id) { GtkSourceStyleInfo *info; if (!force_styles (language)) return NULL; - g_return_val_if_fail (language->priv->styles != NULL, NULL); + g_return_val_if_fail (language->styles != NULL, NULL); - info = g_hash_table_lookup (language->priv->styles, style_id); + info = g_hash_table_lookup (language->styles, style_id); return info; } @@ -892,12 +920,12 @@ get_style_info (GtkSourceLanguage *language, const char *style_id) */ const gchar * gtk_source_language_get_style_name (GtkSourceLanguage *language, - const gchar *style_id) + const gchar *style_id) { GtkSourceStyleInfo *info; g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->id != NULL, NULL); + g_return_val_if_fail (language->id != NULL, NULL); g_return_val_if_fail (style_id != NULL, NULL); info = get_style_info (language, style_id); @@ -922,12 +950,12 @@ gtk_source_language_get_style_name (GtkSourceLanguage *language, */ const gchar * gtk_source_language_get_style_fallback (GtkSourceLanguage *language, - const gchar *style_id) + const gchar *style_id) { GtkSourceStyleInfo *info; g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL); - g_return_val_if_fail (language->priv->id != NULL, NULL); + g_return_val_if_fail (language->id != NULL, NULL); g_return_val_if_fail (style_id != NULL, NULL); info = get_style_info (language, style_id); @@ -938,7 +966,8 @@ gtk_source_language_get_style_fallback (GtkSourceLanguage *language, /* Utility functions for GtkSourceStyleInfo */ GtkSourceStyleInfo * -_gtk_source_style_info_new (const gchar *name, const gchar *map_to) +_gtk_source_style_info_new (const gchar *name, + const gchar *map_to) { GtkSourceStyleInfo *info = g_new0 (GtkSourceStyleInfo, 1); @@ -952,6 +981,7 @@ GtkSourceStyleInfo * _gtk_source_style_info_copy (GtkSourceStyleInfo *info) { g_return_val_if_fail (info != NULL, NULL); + return _gtk_source_style_info_new (info->name, info->map_to); } @@ -959,11 +989,34 @@ void _gtk_source_style_info_free (GtkSourceStyleInfo *info) { if (info == NULL) + { return; + } g_free (info->name); g_free (info->map_to); - g_free (info); } + +void +_gtk_source_language_clear_ctx_data (GtkSourceLanguage *language, + GtkSourceContextData *ctx_data) +{ + if (language->ctx_data == ctx_data) + { + language->ctx_data = NULL; + } +} + +const gchar * +_gtk_source_language_get_file_name (GtkSourceLanguage *language) +{ + return language->lang_file_name; +} + +GHashTable * +_gtk_source_language_get_styles (GtkSourceLanguage *language) +{ + return language->styles; +} diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h index 78515245..61b2e9ac 100644 --- a/gtksourceview/gtksourcelanguage.h +++ b/gtksourceview/gtksourcelanguage.h @@ -29,66 +29,33 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_LANGUAGE (gtk_source_language_get_type ()) -#define GTK_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguage)) -#define GTK_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguageClass)) -#define GTK_SOURCE_IS_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_LANGUAGE)) -#define GTK_SOURCE_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_LANGUAGE)) -#define GTK_SOURCE_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguageClass)) - - -typedef struct _GtkSourceLanguageClass GtkSourceLanguageClass; -typedef struct _GtkSourceLanguagePrivate GtkSourceLanguagePrivate; - -struct _GtkSourceLanguage -{ - GObject parent_instance; - - GtkSourceLanguagePrivate *priv; -}; - -struct _GtkSourceLanguageClass -{ - GObjectClass parent_class; - - /* Padding for future expansion */ - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_LANGUAGE (gtk_source_language_get_type()) GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_language_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceLanguage, gtk_source_language, GTK_SOURCE, LANGUAGE, GObject) GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_language_get_id (GtkSourceLanguage *language); - +const gchar *gtk_source_language_get_id (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_language_get_name (GtkSourceLanguage *language); - +const gchar *gtk_source_language_get_name (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_language_get_section (GtkSourceLanguage *language); - +const gchar *gtk_source_language_get_section (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_language_get_hidden (GtkSourceLanguage *language); - +gboolean gtk_source_language_get_hidden (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_language_get_metadata (GtkSourceLanguage *language, - const gchar *name); - +const gchar *gtk_source_language_get_metadata (GtkSourceLanguage *language, + const gchar *name); GTK_SOURCE_AVAILABLE_IN_ALL -gchar **gtk_source_language_get_mime_types (GtkSourceLanguage *language); - +gchar **gtk_source_language_get_mime_types (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -gchar **gtk_source_language_get_globs (GtkSourceLanguage *language); - +gchar **gtk_source_language_get_globs (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -gchar **gtk_source_language_get_style_ids (GtkSourceLanguage *language); - +gchar **gtk_source_language_get_style_ids (GtkSourceLanguage *language); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_language_get_style_name (GtkSourceLanguage *language, - const gchar *style_id); - +const gchar *gtk_source_language_get_style_name (GtkSourceLanguage *language, + const gchar *style_id); GTK_SOURCE_AVAILABLE_IN_3_4 -const gchar *gtk_source_language_get_style_fallback (GtkSourceLanguage *language, - const gchar *style_id); +const gchar *gtk_source_language_get_style_fallback (GtkSourceLanguage *language, + const gchar *style_id); G_END_DECLS diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c index bdee87c6..030ec99d 100644 --- a/gtksourceview/gtksourcelanguagemanager.c +++ b/gtksourceview/gtksourcelanguagemanager.c @@ -359,6 +359,7 @@ ensure_languages (GtkSourceLanguageManager *lm) for (l = filenames; l != NULL; l = l->next) { GtkSourceLanguage *lang; + const gchar *id; gchar *filename; filename = l->data; @@ -371,16 +372,18 @@ ensure_languages (GtkSourceLanguageManager *lm) continue; } - if (g_hash_table_lookup (lm->priv->language_ids, lang->priv->id) == NULL) + id = gtk_source_language_get_id (lang); + + if (g_hash_table_lookup (lm->priv->language_ids, id) == NULL) { g_hash_table_insert (lm->priv->language_ids, - g_strdup (lang->priv->id), + g_strdup (id), lang); if (ids_array == NULL) ids_array = g_ptr_array_new (); - g_ptr_array_add (ids_array, g_strdup (lang->priv->id)); + g_ptr_array_add (ids_array, g_strdup (id)); } else { -- GitLab From 7d9008a110665911a99d3c2d049314dad628271c Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 09:22:40 -0800 Subject: [PATCH 021/248] language: modernize GtkSourceLanguageManager - Use G_DECLARE_ macros - Make object final - Fix spacing style for multi-line functions --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcelanguagemanager.c | 116 ++++++++++++----------- gtksourceview/gtksourcelanguagemanager.h | 59 +++--------- 3 files changed, 73 insertions(+), 103 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 67d113ac..fe3d5e0a 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceLanguageManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMark, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMap, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourcePrintCompositor, g_object_unref) diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c index 030ec99d..a3745d1b 100644 --- a/gtksourceview/gtksourcelanguagemanager.c +++ b/gtksourceview/gtksourcelanguagemanager.c @@ -44,9 +44,9 @@ * given file name and content type. */ -#define RNG_SCHEMA_FILE "language2.rng" -#define LANGUAGE_DIR "language-specs" -#define LANG_FILE_SUFFIX ".lang" +#define RNG_SCHEMA_FILE "language2.rng" +#define LANGUAGE_DIR "language-specs" +#define LANG_FILE_SUFFIX ".lang" enum { PROP_0, @@ -54,8 +54,10 @@ enum { PROP_LANGUAGE_IDS }; -struct _GtkSourceLanguageManagerPrivate +struct _GtkSourceLanguageManager { + GObject parent_instance; + GHashTable *language_ids; gchar **lang_dirs; @@ -66,13 +68,13 @@ struct _GtkSourceLanguageManagerPrivate static GtkSourceLanguageManager *default_instance; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceLanguageManager, gtk_source_language_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkSourceLanguageManager, gtk_source_language_manager, G_TYPE_OBJECT) static void -gtk_source_language_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +gtk_source_language_manager_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceLanguageManager *lm; @@ -91,10 +93,10 @@ gtk_source_language_manager_set_property (GObject *object, } static void -gtk_source_language_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +gtk_source_language_manager_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceLanguageManager *lm; @@ -119,17 +121,15 @@ gtk_source_language_manager_get_property (GObject *object, static void gtk_source_language_manager_finalize (GObject *object) { - GtkSourceLanguageManager *lm; - - lm = GTK_SOURCE_LANGUAGE_MANAGER (object); + GtkSourceLanguageManager *lm = GTK_SOURCE_LANGUAGE_MANAGER (object); - if (lm->priv->language_ids) - g_hash_table_destroy (lm->priv->language_ids); + if (lm->language_ids) + g_hash_table_destroy (lm->language_ids); - g_strfreev (lm->priv->ids); + g_strfreev (lm->ids); - g_strfreev (lm->priv->lang_dirs); - g_free (lm->priv->rng_file); + g_strfreev (lm->lang_dirs); + g_free (lm->rng_file); G_OBJECT_CLASS (gtk_source_language_manager_parent_class)->finalize (object); } @@ -168,11 +168,11 @@ gtk_source_language_manager_class_init (GtkSourceLanguageManagerClass *klass) static void gtk_source_language_manager_init (GtkSourceLanguageManager *lm) { - lm->priv = gtk_source_language_manager_get_instance_private (lm); - lm->priv->language_ids = NULL; - lm->priv->ids = NULL; - lm->priv->lang_dirs = NULL; - lm->priv->rng_file = NULL; + lm = gtk_source_language_manager_get_instance_private (lm); + lm->language_ids = NULL; + lm->ids = NULL; + lm->lang_dirs = NULL; + lm->rng_file = NULL; } /** @@ -244,8 +244,8 @@ notify_search_path (GtkSourceLanguageManager *mgr) * */ void -gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, - gchar **dirs) +gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, + gchar **dirs) { gchar **tmp; @@ -253,14 +253,14 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, /* Search path cannot be changed in the list of available languages * as been already computed */ - g_return_if_fail (lm->priv->ids == NULL); + g_return_if_fail (lm->ids == NULL); - tmp = lm->priv->lang_dirs; + tmp = lm->lang_dirs; if (dirs == NULL) - lm->priv->lang_dirs = _gtk_source_utils_get_default_dirs (LANGUAGE_DIR); + lm->lang_dirs = _gtk_source_utils_get_default_dirs (LANGUAGE_DIR); else - lm->priv->lang_dirs = g_strdupv (dirs); + lm->lang_dirs = g_strdupv (dirs); g_strfreev (tmp); @@ -282,10 +282,10 @@ gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL); - if (lm->priv->lang_dirs == NULL) - lm->priv->lang_dirs = _gtk_source_utils_get_default_dirs (LANGUAGE_DIR); + if (lm->lang_dirs == NULL) + lm->lang_dirs = _gtk_source_utils_get_default_dirs (LANGUAGE_DIR); - return (const gchar * const *)lm->priv->lang_dirs; + return (const gchar * const *)lm->lang_dirs; } /** @@ -301,7 +301,7 @@ _gtk_source_language_manager_get_rng_file (GtkSourceLanguageManager *lm) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL); - if (lm->priv->rng_file == NULL) + if (lm->rng_file == NULL) { const gchar * const *dirs; @@ -314,7 +314,7 @@ _gtk_source_language_manager_get_rng_file (GtkSourceLanguageManager *lm) file = g_build_filename (*dirs, RNG_SCHEMA_FILE, NULL); if (g_file_test (file, G_FILE_TEST_EXISTS)) { - lm->priv->rng_file = file; + lm->rng_file = file; break; } @@ -322,11 +322,13 @@ _gtk_source_language_manager_get_rng_file (GtkSourceLanguageManager *lm) } } - return lm->priv->rng_file; + return lm->rng_file; } static gint -language_compare (const gchar **id1, const gchar **id2, GHashTable *language_ids) +language_compare (const gchar **id1, + const gchar **id2, + GHashTable *language_ids) { GtkSourceLanguage *lang1, *lang2; const gchar *name1, *name2; @@ -346,10 +348,10 @@ ensure_languages (GtkSourceLanguageManager *lm) GSList *filenames, *l; GPtrArray *ids_array = NULL; - if (lm->priv->language_ids != NULL) + if (lm->language_ids != NULL) return; - lm->priv->language_ids = g_hash_table_new_full (g_str_hash, g_str_equal, + lm->language_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); filenames = _gtk_source_utils_get_file_list ((gchar **)gtk_source_language_manager_get_search_path (lm), @@ -374,9 +376,9 @@ ensure_languages (GtkSourceLanguageManager *lm) id = gtk_source_language_get_id (lang); - if (g_hash_table_lookup (lm->priv->language_ids, id) == NULL) + if (g_hash_table_lookup (lm->language_ids, id) == NULL) { - g_hash_table_insert (lm->priv->language_ids, + g_hash_table_insert (lm->language_ids, g_strdup (id), lang); @@ -397,12 +399,12 @@ ensure_languages (GtkSourceLanguageManager *lm) * is ready to use in a list of a GUI */ g_ptr_array_sort_with_data (ids_array, (GCompareDataFunc)language_compare, - lm->priv->language_ids); + lm->language_ids); /* Ensure the array is NULL terminated */ g_ptr_array_add (ids_array, NULL); - lm->priv->ids = (gchar **)g_ptr_array_free (ids_array, FALSE); + lm->ids = (gchar **)g_ptr_array_free (ids_array, FALSE); } g_slist_free_full (filenames, g_free); @@ -427,7 +429,7 @@ gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm) ensure_languages (lm); - return (const gchar * const *)lm->priv->ids; + return (const gchar * const *)lm->ids; } /** @@ -444,19 +446,19 @@ gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm) */ GtkSourceLanguage * gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm, - const gchar *id) + const gchar *id) { g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL); g_return_val_if_fail (id != NULL, NULL); ensure_languages (lm); - return g_hash_table_lookup (lm->priv->language_ids, id); + return g_hash_table_lookup (lm->language_ids, id); } static GSList * pick_langs_for_filename (GtkSourceLanguageManager *lm, - const gchar *filename) + const gchar *filename) { char *filename_utf8; const gchar* const * p; @@ -498,8 +500,8 @@ pick_langs_for_filename (GtkSourceLanguageManager *lm, static GtkSourceLanguage * pick_lang_for_mime_type_pass (GtkSourceLanguageManager *lm, - const char *mime_type, - gboolean exact_match) + const char *mime_type, + gboolean exact_match) { const gchar* const * id_ptr; @@ -537,7 +539,7 @@ pick_lang_for_mime_type_pass (GtkSourceLanguageManager *lm, static GtkSourceLanguage * pick_lang_for_mime_type_real (GtkSourceLanguageManager *lm, - const char *mime_type) + const char *mime_type) { GtkSourceLanguage *lang; lang = pick_lang_for_mime_type_pass (lm, mime_type, TRUE); @@ -549,8 +551,8 @@ pick_lang_for_mime_type_real (GtkSourceLanguageManager *lm, #ifdef G_OS_WIN32 static void grok_win32_content_type (const gchar *content_type, - gchar **alt_filename, - gchar **mime_type) + gchar **alt_filename, + gchar **mime_type) { *alt_filename = NULL; *mime_type = NULL; @@ -566,7 +568,7 @@ grok_win32_content_type (const gchar *content_type, static GtkSourceLanguage * pick_lang_for_mime_type (GtkSourceLanguageManager *lm, - const gchar *content_type) + const gchar *content_type) { GtkSourceLanguage *lang = NULL; @@ -646,8 +648,8 @@ pick_lang_for_mime_type (GtkSourceLanguageManager *lm, */ GtkSourceLanguage * gtk_source_language_manager_guess_language (GtkSourceLanguageManager *lm, - const gchar *filename, - const gchar *content_type) + const gchar *filename, + const gchar *content_type) { GtkSourceLanguage *lang = NULL; GSList *langs = NULL; diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h index 90609fe3..e1f2f741 100644 --- a/gtksourceview/gtksourcelanguagemanager.h +++ b/gtksourceview/gtksourcelanguagemanager.h @@ -29,61 +29,30 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_LANGUAGE_MANAGER (gtk_source_language_manager_get_type ()) -#define GTK_SOURCE_LANGUAGE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManager)) -#define GTK_SOURCE_LANGUAGE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass)) -#define GTK_SOURCE_IS_LANGUAGE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER)) -#define GTK_SOURCE_IS_LANGUAGE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_LANGUAGE_MANAGER)) -#define GTK_SOURCE_LANGUAGE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass)) - - -typedef struct _GtkSourceLanguageManagerClass GtkSourceLanguageManagerClass; -typedef struct _GtkSourceLanguageManagerPrivate GtkSourceLanguageManagerPrivate; - -struct _GtkSourceLanguageManager -{ - GObject parent_instance; - - GtkSourceLanguageManagerPrivate *priv; -}; - -struct _GtkSourceLanguageManagerClass -{ - GObjectClass parent_class; - - /* Padding for future expansion */ - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_LANGUAGE_MANAGER (gtk_source_language_manager_get_type()) GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_language_manager_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceLanguageManager, gtk_source_language_manager, GTK_SOURCE, LANGUAGE_MANAGER, GObject) GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceLanguageManager *gtk_source_language_manager_new (void); - +GtkSourceLanguageManager *gtk_source_language_manager_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceLanguageManager *gtk_source_language_manager_get_default (void); - +GtkSourceLanguageManager *gtk_source_language_manager_get_default (void); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar * const * gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); - +const gchar * const *gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, - gchar **dirs); - +void gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, + gchar **dirs); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar * const * gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); - +const gchar * const *gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceLanguage *gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm, - const gchar *id); - +GtkSourceLanguage *gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm, + const gchar *id); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceLanguage *gtk_source_language_manager_guess_language (GtkSourceLanguageManager *lm, - const gchar *filename, - const gchar *content_type); - +GtkSourceLanguage *gtk_source_language_manager_guess_language (GtkSourceLanguageManager *lm, + const gchar *filename, + const gchar *content_type); G_GNUC_INTERNAL -GtkSourceLanguageManager *_gtk_source_language_manager_peek_default (void); +GtkSourceLanguageManager *_gtk_source_language_manager_peek_default (void); G_END_DECLS -- GitLab From 61d460699ecc65066e9f498df916fd4bacbcc4e7 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 09:32:32 -0800 Subject: [PATCH 022/248] mark: modernize GtkSourceMark - Use G_DECLARE_ macros - Fix spacing style for multi-line functions - Use get_instance_private() --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcemark.c | 43 ++++++++++++--------------- gtksourceview/gtksourcemark.h | 24 +++------------ 3 files changed, 23 insertions(+), 45 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index fe3d5e0a..a7cb538b 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMark, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMap, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourcePrintCompositor, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchContext, g_object_unref) diff --git a/gtksourceview/gtksourcemark.c b/gtksourceview/gtksourcemark.c index a3b3b8e4..5e32123e 100644 --- a/gtksourceview/gtksourcemark.c +++ b/gtksourceview/gtksourcemark.c @@ -49,24 +49,21 @@ enum PROP_CATEGORY }; -struct _GtkSourceMarkPrivate +typedef struct { gchar *category; -}; +} GtkSourceMarkPrivate; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceMark, gtk_source_mark, GTK_TYPE_TEXT_MARK); +G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceMark, gtk_source_mark, GTK_TYPE_TEXT_MARK) static void gtk_source_mark_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { - GtkSourceMarkPrivate *priv; - - g_return_if_fail (GTK_SOURCE_IS_MARK (object)); - - priv = GTK_SOURCE_MARK (object)->priv; + GtkSourceMark *mark = GTK_SOURCE_MARK (object); + GtkSourceMarkPrivate *priv = gtk_source_mark_get_instance_private (mark); switch (prop_id) { @@ -84,15 +81,11 @@ gtk_source_mark_set_property (GObject *object, static void gtk_source_mark_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { - GtkSourceMark *mark; - - g_return_if_fail (GTK_SOURCE_IS_MARK (object)); - - mark = GTK_SOURCE_MARK (object); + GtkSourceMark *mark = GTK_SOURCE_MARK (object); switch (prop_id) { @@ -111,8 +104,9 @@ static void gtk_source_mark_finalize (GObject *object) { GtkSourceMark *mark = GTK_SOURCE_MARK (object); + GtkSourceMarkPrivate *priv = gtk_source_mark_get_instance_private (mark); - g_free (mark->priv->category); + g_clear_pointer (&priv->category, g_free); G_OBJECT_CLASS (gtk_source_mark_parent_class)->finalize (object); } @@ -148,7 +142,6 @@ gtk_source_mark_class_init (GtkSourceMarkClass *klass) static void gtk_source_mark_init (GtkSourceMark *mark) { - mark->priv = gtk_source_mark_get_instance_private (mark); } /** @@ -195,9 +188,11 @@ gtk_source_mark_new (const gchar *name, const gchar * gtk_source_mark_get_category (GtkSourceMark *mark) { + GtkSourceMarkPrivate *priv = gtk_source_mark_get_instance_private (mark); + g_return_val_if_fail (GTK_SOURCE_IS_MARK (mark), NULL); - return mark->priv->category; + return priv->category; } /** @@ -216,7 +211,7 @@ gtk_source_mark_get_category (GtkSourceMark *mark) */ GtkSourceMark * gtk_source_mark_next (GtkSourceMark *mark, - const gchar *category) + const gchar *category) { GtkTextBuffer *buffer; @@ -250,7 +245,7 @@ gtk_source_mark_next (GtkSourceMark *mark, */ GtkSourceMark * gtk_source_mark_prev (GtkSourceMark *mark, - const gchar *category) + const gchar *category) { GtkTextBuffer *buffer; diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h index d3a17273..426be867 100644 --- a/gtksourceview/gtksourcemark.h +++ b/gtksourceview/gtksourcemark.h @@ -29,35 +29,19 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_MARK (gtk_source_mark_get_type ()) -#define GTK_SOURCE_MARK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_MARK, GtkSourceMark)) -#define GTK_SOURCE_MARK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_MARK, GtkSourceMarkClass)) -#define GTK_SOURCE_IS_MARK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_MARK)) -#define GTK_SOURCE_IS_MARK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_MARK)) -#define GTK_SOURCE_MARK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_MARK, GtkSourceMarkClass)) +#define GTK_SOURCE_TYPE_MARK (gtk_source_mark_get_type()) -typedef struct _GtkSourceMarkClass GtkSourceMarkClass; - -typedef struct _GtkSourceMarkPrivate GtkSourceMarkPrivate; - -struct _GtkSourceMark -{ - GtkTextMark parent_instance; - - GtkSourceMarkPrivate *priv; -}; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourceMark, gtk_source_mark, GTK_SOURCE, MARK, GtkTextMark) struct _GtkSourceMarkClass { GtkTextMarkClass parent_class; /* Padding for future expansion */ - gpointer padding[10]; + gpointer _reserved[10]; }; -GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_mark_get_type (void) G_GNUC_CONST; - GTK_SOURCE_AVAILABLE_IN_ALL GtkSourceMark *gtk_source_mark_new (const gchar *name, const gchar *category); -- GitLab From aa3140aa69760b62e4aaea726801951c1cb6b8b5 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 09:51:51 -0800 Subject: [PATCH 023/248] view: modernize GtkSourceView - Use G_DECLARE_ macros - Fix spacing style for multi-line functions - Use get_instance_private() --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourceview.c | 901 ++++++++++++++------------ gtksourceview/gtksourceview.h | 208 +++--- 3 files changed, 566 insertions(+), 544 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index a7cb538b..7f6959b7 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -38,7 +38,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserButton, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserWidget, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceUndoManager, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceView, g_object_unref) #endif /* __GI_SCANNER__ */ diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c index 734797ca..baa8750c 100644 --- a/gtksourceview/gtksourceview.c +++ b/gtksourceview/gtksourceview.c @@ -137,16 +137,16 @@ #define PROFILE(x) #endif -#define GUTTER_PIXMAP 16 -#define DEFAULT_TAB_WIDTH 8 -#define MAX_TAB_WIDTH 32 -#define MAX_INDENT_WIDTH 32 +#define GUTTER_PIXMAP 16 +#define DEFAULT_TAB_WIDTH 8 +#define MAX_TAB_WIDTH 32 +#define MAX_INDENT_WIDTH 32 -#define DEFAULT_RIGHT_MARGIN_POSITION 80 -#define MAX_RIGHT_MARGIN_POSITION 1000 +#define DEFAULT_RIGHT_MARGIN_POSITION 80 +#define MAX_RIGHT_MARGIN_POSITION 1000 -#define RIGHT_MARGIN_LINE_ALPHA 40 -#define RIGHT_MARGIN_OVERLAY_ALPHA 15 +#define RIGHT_MARGIN_LINE_ALPHA 40 +#define RIGHT_MARGIN_OVERLAY_ALPHA 15 enum { @@ -184,7 +184,7 @@ enum PROP_SPACE_DRAWER }; -struct _GtkSourceViewPrivate +typedef struct { GtkSourceStyleScheme *style_scheme; GdkRGBA *right_margin_line_color; @@ -225,15 +225,13 @@ struct _GtkSourceViewPrivate guint current_line_color_set : 1; guint background_pattern_color_set : 1; guint smart_backspace : 1; -}; - -typedef struct _MarkCategory MarkCategory; +} GtkSourceViewPrivate; -struct _MarkCategory +typedef struct { GtkSourceMarkAttributes *attributes; gint priority; -}; +} MarkCategory; static guint signals[N_SIGNALS]; @@ -253,73 +251,71 @@ static const GtkTargetEntry drop_types[] = { {(gchar *)"application/x-color", 0, TARGET_COLOR} }; -/* Prototypes. */ -static void gtk_source_view_dispose (GObject *object); -static void gtk_source_view_finalize (GObject *object); -static void gtk_source_view_undo (GtkSourceView *view); -static void gtk_source_view_redo (GtkSourceView *view); -static void gtk_source_view_show_completion_real (GtkSourceView *view); -static GtkTextBuffer * gtk_source_view_create_buffer (GtkTextView *view); -static void remove_source_buffer (GtkSourceView *view); -static void set_source_buffer (GtkSourceView *view, - GtkTextBuffer *buffer); -static void gtk_source_view_populate_popup (GtkTextView *view, - GtkWidget *popup); -static void gtk_source_view_move_cursor (GtkTextView *text_view, - GtkMovementStep step, - gint count, - gboolean extend_selection); -static void gtk_source_view_delete_from_cursor (GtkTextView *text_view, - GtkDeleteType type, - gint count); -static gboolean gtk_source_view_extend_selection (GtkTextView *text_view, - GtkTextExtendSelection granularity, - const GtkTextIter *location, - GtkTextIter *start, - GtkTextIter *end); -static void gtk_source_view_get_lines (GtkTextView *text_view, - gint first_y, - gint last_y, - GArray *buffer_coords, - GArray *line_heights, - GArray *numbers, - gint *countp); -static gboolean gtk_source_view_draw (GtkWidget *widget, - cairo_t *cr); -static void gtk_source_view_move_lines (GtkSourceView *view, - gboolean down); -static void gtk_source_view_move_words (GtkSourceView *view, - gint step); -static gboolean gtk_source_view_key_press_event (GtkWidget *widget, - GdkEventKey *event); -static void view_dnd_drop (GtkTextView *view, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint info, - guint timestamp, - gpointer data); -static gint calculate_real_tab_width (GtkSourceView *view, - guint tab_size, - gchar c); -static void gtk_source_view_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_source_view_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void gtk_source_view_style_updated (GtkWidget *widget); -static void gtk_source_view_update_style_scheme (GtkSourceView *view); -static void gtk_source_view_draw_layer (GtkTextView *view, - GtkTextViewLayer layer, - cairo_t *cr); - -static MarkCategory *mark_category_new (GtkSourceMarkAttributes *attributes, - gint priority); -static void mark_category_free (MarkCategory *category); +static void gtk_source_view_dispose (GObject *object); +static void gtk_source_view_finalize (GObject *object); +static void gtk_source_view_undo (GtkSourceView *view); +static void gtk_source_view_redo (GtkSourceView *view); +static void gtk_source_view_show_completion_real (GtkSourceView *view); +static GtkTextBuffer *gtk_source_view_create_buffer (GtkTextView *view); +static void remove_source_buffer (GtkSourceView *view); +static void set_source_buffer (GtkSourceView *view, + GtkTextBuffer *buffer); +static void gtk_source_view_populate_popup (GtkTextView *view, + GtkWidget *popup); +static void gtk_source_view_move_cursor (GtkTextView *text_view, + GtkMovementStep step, + gint count, + gboolean extend_selection); +static void gtk_source_view_delete_from_cursor (GtkTextView *text_view, + GtkDeleteType type, + gint count); +static gboolean gtk_source_view_extend_selection (GtkTextView *text_view, + GtkTextExtendSelection granularity, + const GtkTextIter *location, + GtkTextIter *start, + GtkTextIter *end); +static void gtk_source_view_get_lines (GtkTextView *text_view, + gint first_y, + gint last_y, + GArray *buffer_coords, + GArray *line_heights, + GArray *numbers, + gint *countp); +static gboolean gtk_source_view_draw (GtkWidget *widget, + cairo_t *cr); +static void gtk_source_view_move_lines (GtkSourceView *view, + gboolean down); +static void gtk_source_view_move_words (GtkSourceView *view, + gint step); +static gboolean gtk_source_view_key_press_event (GtkWidget *widget, + GdkEventKey *event); +static void view_dnd_drop (GtkTextView *view, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint timestamp, + gpointer data); +static gint calculate_real_tab_width (GtkSourceView *view, + guint tab_size, + gchar c); +static void gtk_source_view_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_source_view_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void gtk_source_view_style_updated (GtkWidget *widget); +static void gtk_source_view_update_style_scheme (GtkSourceView *view); +static void gtk_source_view_draw_layer (GtkTextView *view, + GtkTextViewLayer layer, + cairo_t *cr); +static MarkCategory *mark_category_new (GtkSourceMarkAttributes *attributes, + gint priority); +static void mark_category_free (MarkCategory *category); static void gtk_source_view_constructed (GObject *object) @@ -333,7 +329,7 @@ gtk_source_view_constructed (GObject *object) static void gtk_source_view_move_to_matching_bracket (GtkSourceView *view, - gboolean extend_selection) + gboolean extend_selection) { GtkTextView *text_view = GTK_TEXT_VIEW (view); GtkTextBuffer *buffer; @@ -368,7 +364,7 @@ gtk_source_view_move_to_matching_bracket (GtkSourceView *view, static void gtk_source_view_change_number (GtkSourceView *view, - gint count) + gint count) { GtkTextView *text_view = GTK_TEXT_VIEW (view); GtkTextBuffer *buffer; @@ -430,7 +426,7 @@ gtk_source_view_change_number (GtkSourceView *view, static void gtk_source_view_change_case (GtkSourceView *view, - GtkSourceChangeCaseType case_type) + GtkSourceChangeCaseType case_type) { GtkSourceBuffer *buffer; GtkTextIter start, end; @@ -1137,9 +1133,9 @@ gtk_source_view_buildable_interface_init (GtkBuildableIface *iface) static void gtk_source_view_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceView *view; @@ -1209,9 +1205,9 @@ gtk_source_view_set_property (GObject *object, static void gtk_source_view_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceView *view; @@ -1289,8 +1285,8 @@ gtk_source_view_get_property (GObject *object, static void space_drawer_notify_cb (GtkSourceSpaceDrawer *space_drawer, - GParamSpec *pspec, - GtkSourceView *view) + GParamSpec *pspec, + GtkSourceView *view) { gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -1304,37 +1300,36 @@ notify_buffer_cb (GtkSourceView *view) static void gtk_source_view_init (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkStyleContext *context; - GtkTargetList *target_list; - view->priv = gtk_source_view_get_instance_private (view); - view->priv->tab_width = DEFAULT_TAB_WIDTH; - view->priv->tabs_set = FALSE; - view->priv->indent_width = -1; - view->priv->indent_on_tab = TRUE; - view->priv->smart_home_end = GTK_SOURCE_SMART_HOME_END_DISABLED; - view->priv->right_margin_pos = DEFAULT_RIGHT_MARGIN_POSITION; - view->priv->cached_right_margin_pos = -1; + priv->tab_width = DEFAULT_TAB_WIDTH; + priv->tabs_set = FALSE; + priv->indent_width = -1; + priv->indent_on_tab = TRUE; + priv->smart_home_end = GTK_SOURCE_SMART_HOME_END_DISABLED; + priv->right_margin_pos = DEFAULT_RIGHT_MARGIN_POSITION; + priv->cached_right_margin_pos = -1; gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 2); gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 2); - view->priv->right_margin_line_color = NULL; - view->priv->right_margin_overlay_color = NULL; + priv->right_margin_line_color = NULL; + priv->right_margin_overlay_color = NULL; - view->priv->space_drawer = gtk_source_space_drawer_new (); - g_signal_connect_object (view->priv->space_drawer, + priv->space_drawer = gtk_source_space_drawer_new (); + g_signal_connect_object (priv->space_drawer, "notify", G_CALLBACK (space_drawer_notify_cb), view, 0); - view->priv->mark_categories = g_hash_table_new_full (g_str_hash, - g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) mark_category_free); + priv->mark_categories = g_hash_table_new_full (g_str_hash, + g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) mark_category_free); target_list = gtk_drag_dest_get_target_list (GTK_WIDGET (view)); g_return_if_fail (target_list != NULL); @@ -1361,12 +1356,13 @@ static void gtk_source_view_dispose (GObject *object) { GtkSourceView *view = GTK_SOURCE_VIEW (object); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); - g_clear_object (&view->priv->completion); - g_clear_object (&view->priv->left_gutter); - g_clear_object (&view->priv->right_gutter); - g_clear_object (&view->priv->style_scheme); - g_clear_object (&view->priv->space_drawer); + g_clear_object (&priv->completion); + g_clear_object (&priv->left_gutter); + g_clear_object (&priv->right_gutter); + g_clear_object (&priv->style_scheme); + g_clear_object (&priv->space_drawer); remove_source_buffer (view); @@ -1385,20 +1381,21 @@ static void gtk_source_view_finalize (GObject *object) { GtkSourceView *view = GTK_SOURCE_VIEW (object); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); - if (view->priv->right_margin_line_color != NULL) + if (priv->right_margin_line_color != NULL) { - gdk_rgba_free (view->priv->right_margin_line_color); + gdk_rgba_free (priv->right_margin_line_color); } - if (view->priv->right_margin_overlay_color != NULL) + if (priv->right_margin_overlay_color != NULL) { - gdk_rgba_free (view->priv->right_margin_overlay_color); + gdk_rgba_free (priv->right_margin_overlay_color); } - if (view->priv->mark_categories) + if (priv->mark_categories) { - g_hash_table_destroy (view->priv->mark_categories); + g_hash_table_destroy (priv->mark_categories); } G_OBJECT_CLASS (gtk_source_view_parent_class)->finalize (object); @@ -1406,8 +1403,8 @@ gtk_source_view_finalize (GObject *object) static void get_visible_region (GtkTextView *text_view, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { GdkRectangle visible_rect; @@ -1429,9 +1426,9 @@ get_visible_region (GtkTextView *text_view, static void highlight_updated_cb (GtkSourceBuffer *buffer, - GtkTextIter *_start, - GtkTextIter *_end, - GtkTextView *text_view) + GtkTextIter *_start, + GtkTextIter *_end, + GtkTextView *text_view) { GtkTextIter start; GtkTextIter end; @@ -1505,8 +1502,8 @@ highlight_updated_cb (GtkSourceBuffer *buffer, static void search_start_cb (GtkSourceBufferInternal *buffer_internal, - GtkSourceSearchContext *search_context, - GtkSourceView *view) + GtkSourceSearchContext *search_context, + GtkSourceView *view) { GtkTextIter visible_start; GtkTextIter visible_end; @@ -1515,8 +1512,9 @@ search_start_cb (GtkSourceBufferInternal *buffer_internal, #ifndef G_DISABLE_ASSERT { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkSourceBuffer *buffer_search = gtk_source_search_context_get_buffer (search_context); - g_assert (buffer_search == view->priv->source_buffer); + g_assert (buffer_search == priv->source_buffer); } #endif @@ -1528,8 +1526,8 @@ search_start_cb (GtkSourceBufferInternal *buffer_internal, static void source_mark_updated_cb (GtkSourceBuffer *buffer, - GtkSourceMark *mark, - GtkTextView *text_view) + GtkSourceMark *mark, + GtkTextView *text_view) { /* TODO do something more intelligent here, namely * invalidate only the area under the mark if possible */ @@ -1538,16 +1536,16 @@ source_mark_updated_cb (GtkSourceBuffer *buffer, static void buffer_style_scheme_changed_cb (GtkSourceBuffer *buffer, - GParamSpec *pspec, - GtkSourceView *view) + GParamSpec *pspec, + GtkSourceView *view) { gtk_source_view_update_style_scheme (view); } static void implicit_trailing_newline_changed_cb (GtkSourceBuffer *buffer, - GParamSpec *pspec, - GtkSourceView *view) + GParamSpec *pspec, + GtkSourceView *view) { /* For drawing or not a trailing newline. */ gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -1556,42 +1554,46 @@ implicit_trailing_newline_changed_cb (GtkSourceBuffer *buffer, static void remove_source_buffer (GtkSourceView *view) { - if (view->priv->source_buffer != NULL) + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + + if (priv->source_buffer != NULL) { GtkSourceBufferInternal *buffer_internal; - g_signal_handlers_disconnect_by_func (view->priv->source_buffer, + g_signal_handlers_disconnect_by_func (priv->source_buffer, highlight_updated_cb, view); - g_signal_handlers_disconnect_by_func (view->priv->source_buffer, + g_signal_handlers_disconnect_by_func (priv->source_buffer, source_mark_updated_cb, view); - g_signal_handlers_disconnect_by_func (view->priv->source_buffer, + g_signal_handlers_disconnect_by_func (priv->source_buffer, buffer_style_scheme_changed_cb, view); - g_signal_handlers_disconnect_by_func (view->priv->source_buffer, + g_signal_handlers_disconnect_by_func (priv->source_buffer, implicit_trailing_newline_changed_cb, view); - buffer_internal = _gtk_source_buffer_internal_get_from_buffer (view->priv->source_buffer); + buffer_internal = _gtk_source_buffer_internal_get_from_buffer (priv->source_buffer); g_signal_handlers_disconnect_by_func (buffer_internal, search_start_cb, view); - g_object_unref (view->priv->source_buffer); - view->priv->source_buffer = NULL; + g_object_unref (priv->source_buffer); + priv->source_buffer = NULL; } } static void set_source_buffer (GtkSourceView *view, - GtkTextBuffer *buffer) + GtkTextBuffer *buffer) { - if (buffer == (GtkTextBuffer*) view->priv->source_buffer) + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + + if (buffer == (GtkTextBuffer*) priv->source_buffer) { return; } @@ -1602,7 +1604,7 @@ set_source_buffer (GtkSourceView *view, { GtkSourceBufferInternal *buffer_internal; - view->priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer)); + priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer)); g_signal_connect (buffer, "highlight-updated", @@ -1624,7 +1626,7 @@ set_source_buffer (GtkSourceView *view, G_CALLBACK (implicit_trailing_newline_changed_cb), view); - buffer_internal = _gtk_source_buffer_internal_get_from_buffer (view->priv->source_buffer); + buffer_internal = _gtk_source_buffer_internal_get_from_buffer (priv->source_buffer); g_signal_connect (buffer_internal, "search-start", @@ -1637,7 +1639,7 @@ set_source_buffer (GtkSourceView *view, static void scroll_to_insert (GtkSourceView *view, - GtkTextBuffer *buffer) + GtkTextBuffer *buffer) { GtkTextMark *insert; GtkTextIter iter; @@ -1734,7 +1736,7 @@ gtk_source_view_show_completion_real (GtkSourceView *view) static void menu_item_activate_change_case_cb (GtkWidget *menu_item, - GtkTextView *text_view) + GtkTextView *text_view) { GtkTextBuffer *buffer; GtkTextIter start, end; @@ -1756,7 +1758,7 @@ menu_item_activate_change_case_cb (GtkWidget *menu_item, static void menu_item_activate_cb (GtkWidget *menu_item, - GtkTextView *text_view) + GtkTextView *text_view) { const gchar *gtksignal; @@ -1766,7 +1768,7 @@ menu_item_activate_cb (GtkWidget *menu_item, static void gtk_source_view_populate_popup (GtkTextView *text_view, - GtkWidget *popup) + GtkWidget *popup) { GtkTextBuffer *buffer; GtkMenuShell *menu; @@ -1875,8 +1877,8 @@ gtk_source_view_populate_popup (GtkTextView *text_view, static void move_cursor (GtkTextView *text_view, - const GtkTextIter *new_location, - gboolean extend_selection) + const GtkTextIter *new_location, + gboolean extend_selection) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); GtkTextMark *insert = gtk_text_buffer_get_insert (buffer); @@ -1895,8 +1897,8 @@ move_cursor (GtkTextView *text_view, static void move_to_first_char (GtkTextView *text_view, - GtkTextIter *iter, - gboolean display_line) + GtkTextIter *iter, + gboolean display_line) { GtkTextIter last; @@ -1940,8 +1942,8 @@ move_to_first_char (GtkTextView *text_view, static void move_to_last_char (GtkTextView *text_view, - GtkTextIter *iter, - gboolean display_line) + GtkTextIter *iter, + gboolean display_line) { GtkTextIter first; @@ -1984,10 +1986,10 @@ move_to_last_char (GtkTextView *text_view, static void do_cursor_move_home_end (GtkTextView *text_view, - GtkTextIter *cur, - GtkTextIter *iter, - gboolean extend_selection, - gint count) + GtkTextIter *cur, + GtkTextIter *iter, + gboolean extend_selection, + gint count) { /* if we are clearing selection, we need to move_cursor even * if we are at proper iter because selection_bound may need @@ -2002,11 +2004,12 @@ do_cursor_move_home_end (GtkTextView *text_view, /* Returns %TRUE if handled. */ static gboolean move_cursor_smart_home_end (GtkTextView *text_view, - GtkMovementStep step, - gint count, - gboolean extend_selection) + GtkMovementStep step, + gint count, + gboolean extend_selection) { GtkSourceView *source_view = GTK_SOURCE_VIEW (text_view); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (source_view); GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); gboolean move_display_line; GtkTextMark *mark; @@ -2037,7 +2040,7 @@ move_cursor_smart_home_end (GtkTextView *text_view, at_home = gtk_text_iter_starts_line (&cur); } - switch (source_view->priv->smart_home_end) + switch (priv->smart_home_end) { case GTK_SOURCE_SMART_HOME_END_BEFORE: if (!gtk_text_iter_equal (&cur, &iter) || at_home) @@ -2095,7 +2098,7 @@ move_cursor_smart_home_end (GtkTextView *text_view, at_end = gtk_text_iter_ends_line (&cur); } - switch (source_view->priv->smart_home_end) + switch (priv->smart_home_end) { case GTK_SOURCE_SMART_HOME_END_BEFORE: if (!gtk_text_iter_equal (&cur, &iter) || at_end) @@ -2140,8 +2143,8 @@ move_cursor_smart_home_end (GtkTextView *text_view, static void move_cursor_words (GtkTextView *text_view, - gint count, - gboolean extend_selection) + gint count, + gboolean extend_selection) { GtkTextBuffer *buffer; GtkTextIter insert; @@ -2211,9 +2214,9 @@ move_cursor_words (GtkTextView *text_view, static void gtk_source_view_move_cursor (GtkTextView *text_view, - GtkMovementStep step, - gint count, - gboolean extend_selection) + GtkMovementStep step, + gint count, + gboolean extend_selection) { if (!gtk_text_view_get_cursor_visible (text_view)) { @@ -2256,8 +2259,8 @@ chain_up: static void gtk_source_view_delete_from_cursor (GtkTextView *text_view, - GtkDeleteType type, - gint count) + GtkDeleteType type, + gint count) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); GtkTextIter insert; @@ -2302,10 +2305,10 @@ gtk_source_view_delete_from_cursor (GtkTextView *text_view, static gboolean gtk_source_view_extend_selection (GtkTextView *text_view, - GtkTextExtendSelection granularity, - const GtkTextIter *location, - GtkTextIter *start, - GtkTextIter *end) + GtkTextExtendSelection granularity, + const GtkTextIter *location, + GtkTextIter *start, + GtkTextIter *end) { if (granularity == GTK_TEXT_EXTEND_SELECTION_WORD) { @@ -2322,12 +2325,13 @@ gtk_source_view_extend_selection (GtkTextView *text_view, static void gtk_source_view_ensure_redrawn_rect_is_highlighted (GtkSourceView *view, - cairo_t *cr) + cairo_t *cr) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GdkRectangle clip; GtkTextIter iter1, iter2; - if (view->priv->source_buffer == NULL || + if (priv->source_buffer == NULL || !gdk_cairo_get_clip_rectangle (cr, &clip)) { return; @@ -2345,21 +2349,21 @@ gtk_source_view_ensure_redrawn_rect_is_highlighted (GtkSourceView *view, gtk_text_iter_get_line (&iter2)); }); - _gtk_source_buffer_update_syntax_highlight (view->priv->source_buffer, + _gtk_source_buffer_update_syntax_highlight (priv->source_buffer, &iter1, &iter2, FALSE); - _gtk_source_buffer_update_search_highlight (view->priv->source_buffer, + _gtk_source_buffer_update_search_highlight (priv->source_buffer, &iter1, &iter2, FALSE); } /* This function is taken from gtk+/tests/testtext.c */ static void gtk_source_view_get_lines (GtkTextView *text_view, - gint first_y, - gint last_y, - GArray *buffer_coords, - GArray *line_heights, - GArray *numbers, - gint *countp) + gint first_y, + gint last_y, + GArray *buffer_coords, + GArray *line_heights, + GArray *numbers, + gint *countp) { GtkTextIter iter; gint count; @@ -2432,11 +2436,11 @@ gtk_source_view_get_lines (GtkTextView *text_view, * See https://bugzilla.gnome.org/show_bug.cgi?id=310847 for more details. */ static void -gtk_source_view_paint_line_background (GtkTextView *text_view, - cairo_t *cr, - int y, /* in buffer coordinates */ - int height, - const GdkRGBA *color) +gtk_source_view_paint_line_background (GtkTextView *text_view, + cairo_t *cr, + int y, /* in buffer coordinates */ + int height, + const GdkRGBA *color) { gdouble x1, y1, x2, y2; @@ -2453,8 +2457,9 @@ gtk_source_view_paint_line_background (GtkTextView *text_view, static void gtk_source_view_paint_marks_background (GtkSourceView *view, - cairo_t *cr) + cairo_t *cr) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextView *text_view; GdkRectangle clip; GArray *numbers; @@ -2464,8 +2469,8 @@ gtk_source_view_paint_marks_background (GtkSourceView *view, gint count; gint i; - if (view->priv->source_buffer == NULL || - !_gtk_source_buffer_has_source_marks (view->priv->source_buffer) || + if (priv->source_buffer == NULL || + !_gtk_source_buffer_has_source_marks (priv->source_buffer) || !gdk_cairo_get_clip_rectangle (cr, &clip)) { return; @@ -2520,7 +2525,7 @@ gtk_source_view_paint_marks_background (GtkSourceView *view, line_to_paint = g_array_index (numbers, gint, i); - marks = gtk_source_buffer_get_source_marks_at_line (view->priv->source_buffer, + marks = gtk_source_buffer_get_source_marks_at_line (priv->source_buffer, line_to_paint, NULL); @@ -2564,13 +2569,13 @@ gtk_source_view_paint_marks_background (GtkSourceView *view, static void gtk_source_view_paint_right_margin (GtkSourceView *view, - cairo_t *cr) + cairo_t *cr) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + GtkTextView *text_view = GTK_TEXT_VIEW (view); GdkRectangle clip; gdouble x; - GtkTextView *text_view = GTK_TEXT_VIEW (view); - #ifdef ENABLE_PROFILE static GTimer *timer = NULL; @@ -2582,22 +2587,22 @@ gtk_source_view_paint_right_margin (GtkSourceView *view, g_timer_start (timer); #endif - g_return_if_fail (view->priv->right_margin_line_color != NULL); + g_return_if_fail (priv->right_margin_line_color != NULL); if (!gdk_cairo_get_clip_rectangle (cr, &clip)) { return; } - if (view->priv->cached_right_margin_pos < 0) + if (priv->cached_right_margin_pos < 0) { - view->priv->cached_right_margin_pos = + priv->cached_right_margin_pos = calculate_real_tab_width (view, - view->priv->right_margin_pos, + priv->right_margin_pos, '_'); } - x = view->priv->cached_right_margin_pos + gtk_text_view_get_left_margin (text_view); + x = priv->cached_right_margin_pos + gtk_text_view_get_left_margin (text_view); cairo_save (cr); cairo_set_line_width (cr, 1.0); @@ -2607,19 +2612,19 @@ gtk_source_view_paint_right_margin (GtkSourceView *view, cairo_move_to (cr, x + 0.5, clip.y); cairo_line_to (cr, x + 0.5, clip.y + clip.height); - gdk_cairo_set_source_rgba (cr, view->priv->right_margin_line_color); + gdk_cairo_set_source_rgba (cr, priv->right_margin_line_color); cairo_stroke (cr); } /* Only draw the overlay when the style scheme explicitly sets it. */ - if (view->priv->right_margin_overlay_color != NULL && clip.x + clip.width > x + 1) + if (priv->right_margin_overlay_color != NULL && clip.x + clip.width > x + 1) { /* Draw the rectangle next to the line (x+1). */ cairo_rectangle (cr, x + 1, clip.y, clip.x + clip.width - (x + 1), clip.height); - gdk_cairo_set_source_rgba (cr, view->priv->right_margin_overlay_color); + gdk_cairo_set_source_rgba (cr, priv->right_margin_overlay_color); cairo_fill (cr); } @@ -2635,7 +2640,7 @@ gtk_source_view_paint_right_margin (GtkSourceView *view, static gint realign (gint offset, - guint align) + guint align) { if (offset > 0 && align > 0) { @@ -2650,8 +2655,9 @@ realign (gint offset, static void gtk_source_view_paint_background_pattern_grid (GtkSourceView *view, - cairo_t *cr) + cairo_t *cr) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GdkRectangle clip; gint x, y, x2, y2; PangoContext *context; @@ -2674,7 +2680,7 @@ gtk_source_view_paint_background_pattern_grid (GtkSourceView *view, gdk_cairo_get_clip_rectangle (cr, &clip); cairo_set_line_width (cr, 1.0); - gdk_cairo_set_source_rgba (cr, &view->priv->background_pattern_color); + gdk_cairo_set_source_rgba (cr, &priv->background_pattern_color); /* Align our drawing position with a multiple of the grid size. */ x = realign (clip.x - grid_width, grid_width); @@ -2700,8 +2706,9 @@ gtk_source_view_paint_background_pattern_grid (GtkSourceView *view, static void gtk_source_view_paint_current_line_highlight (GtkSourceView *view, - cairo_t *cr) + cairo_t *cr) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buffer; GtkTextIter cur; gint y; @@ -2716,17 +2723,16 @@ gtk_source_view_paint_current_line_highlight (GtkSourceView *view, gtk_source_view_paint_line_background (GTK_TEXT_VIEW (view), cr, y, height, - &view->priv->current_line_color); + &priv->current_line_color); } static void gtk_source_view_draw_layer (GtkTextView *text_view, - GtkTextViewLayer layer, - cairo_t *cr) + GtkTextViewLayer layer, + cairo_t *cr) { - GtkSourceView *view; - - view = GTK_SOURCE_VIEW (text_view); + GtkSourceView *view = GTK_SOURCE_VIEW (text_view); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); cairo_save (cr); @@ -2734,15 +2740,15 @@ gtk_source_view_draw_layer (GtkTextView *text_view, { gtk_source_view_ensure_redrawn_rect_is_highlighted (view, cr); - if (view->priv->background_pattern == GTK_SOURCE_BACKGROUND_PATTERN_TYPE_GRID && - view->priv->background_pattern_color_set) + if (priv->background_pattern == GTK_SOURCE_BACKGROUND_PATTERN_TYPE_GRID && + priv->background_pattern_color_set) { gtk_source_view_paint_background_pattern_grid (view, cr); } if (gtk_widget_is_sensitive (GTK_WIDGET (view)) && - view->priv->highlight_current_line && - view->priv->current_line_color_set) + priv->highlight_current_line && + priv->current_line_color_set) { gtk_source_view_paint_current_line_highlight (view, cr); } @@ -2752,14 +2758,14 @@ gtk_source_view_draw_layer (GtkTextView *text_view, else if (layer == GTK_TEXT_VIEW_LAYER_ABOVE_TEXT) { /* Draw the right margin vertical line + overlay. */ - if (view->priv->show_right_margin) + if (priv->show_right_margin) { gtk_source_view_paint_right_margin (view, cr); } - if (view->priv->space_drawer != NULL) + if (priv->space_drawer != NULL) { - _gtk_source_space_drawer_draw (view->priv->space_drawer, view, cr); + _gtk_source_space_drawer_draw (priv->space_drawer, view, cr); } } @@ -2768,9 +2774,10 @@ gtk_source_view_draw_layer (GtkTextView *text_view, static gboolean gtk_source_view_draw (GtkWidget *widget, - cairo_t *cr) + cairo_t *cr) { GtkSourceView *view = GTK_SOURCE_VIEW (widget); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); gboolean event_handled; #ifdef ENABLE_PROFILE @@ -2789,14 +2796,14 @@ gtk_source_view_draw (GtkWidget *widget, event_handled = GTK_WIDGET_CLASS (gtk_source_view_parent_class)->draw (widget, cr); - if (view->priv->left_gutter != NULL) + if (priv->left_gutter != NULL) { - _gtk_source_gutter_draw (view->priv->left_gutter, view, cr); + _gtk_source_gutter_draw (priv->left_gutter, view, cr); } - if (view->priv->right_gutter != NULL) + if (priv->right_gutter != NULL) { - _gtk_source_gutter_draw (view->priv->right_gutter, view, cr); + _gtk_source_gutter_draw (priv->right_gutter, view, cr); } PROFILE ({ @@ -2914,9 +2921,11 @@ gtk_source_view_new_with_buffer (GtkSourceBuffer *buffer) gboolean gtk_source_view_get_show_line_numbers (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->show_line_numbers; + return priv->show_line_numbers; } /** @@ -2928,25 +2937,27 @@ gtk_source_view_get_show_line_numbers (GtkSourceView *view) */ void gtk_source_view_set_show_line_numbers (GtkSourceView *view, - gboolean show) + gboolean show) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); show = show != FALSE; - if (show == view->priv->show_line_numbers) + if (show == priv->show_line_numbers) { return; } - if (view->priv->line_renderer == NULL) + if (priv->line_renderer == NULL) { GtkSourceGutter *gutter; gutter = gtk_source_view_get_gutter (view, GTK_TEXT_WINDOW_LEFT); - view->priv->line_renderer = gtk_source_gutter_renderer_lines_new (); - g_object_set (view->priv->line_renderer, + priv->line_renderer = gtk_source_gutter_renderer_lines_new (); + g_object_set (priv->line_renderer, "alignment-mode", GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_FIRST, "yalign", 0.5, "xalign", 1.0, @@ -2954,12 +2965,12 @@ gtk_source_view_set_show_line_numbers (GtkSourceView *view, NULL); gtk_source_gutter_insert (gutter, - view->priv->line_renderer, + priv->line_renderer, GTK_SOURCE_VIEW_GUTTER_POSITION_LINES); } - gtk_source_gutter_renderer_set_visible (view->priv->line_renderer, show); - view->priv->show_line_numbers = show; + gtk_source_gutter_renderer_set_visible (priv->line_renderer, show); + priv->show_line_numbers = show; g_object_notify (G_OBJECT (view), "show_line_numbers"); } @@ -2977,17 +2988,19 @@ gtk_source_view_set_show_line_numbers (GtkSourceView *view, gboolean gtk_source_view_get_show_line_marks (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->show_line_marks; + return priv->show_line_marks; } static void gutter_renderer_marks_activate (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - const GdkRectangle *area, - GdkEvent *event, - GtkSourceView *view) + GtkTextIter *iter, + const GdkRectangle *area, + GdkEvent *event, + GtkSourceView *view) { g_signal_emit (view, signals[LINE_MARK_ACTIVATED], @@ -3007,37 +3020,39 @@ gutter_renderer_marks_activate (GtkSourceGutterRenderer *renderer, */ void gtk_source_view_set_show_line_marks (GtkSourceView *view, - gboolean show) + gboolean show) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); show = show != FALSE; - if (show == view->priv->show_line_marks) + if (show == priv->show_line_marks) { return; } - if (view->priv->marks_renderer == NULL) + if (priv->marks_renderer == NULL) { GtkSourceGutter *gutter; gutter = gtk_source_view_get_gutter (view, GTK_TEXT_WINDOW_LEFT); - view->priv->marks_renderer = gtk_source_gutter_renderer_marks_new (); + priv->marks_renderer = gtk_source_gutter_renderer_marks_new (); gtk_source_gutter_insert (gutter, - view->priv->marks_renderer, + priv->marks_renderer, GTK_SOURCE_VIEW_GUTTER_POSITION_MARKS); - g_signal_connect (view->priv->marks_renderer, + g_signal_connect (priv->marks_renderer, "activate", G_CALLBACK (gutter_renderer_marks_activate), view); } - gtk_source_gutter_renderer_set_visible (view->priv->marks_renderer, show); - view->priv->show_line_marks = show; + gtk_source_gutter_renderer_set_visible (priv->marks_renderer, show); + priv->show_line_marks = show; g_object_notify (G_OBJECT (view), "show_line_marks"); } @@ -3045,10 +3060,11 @@ gtk_source_view_set_show_line_marks (GtkSourceView *view, static gboolean set_tab_stops_internal (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); PangoTabArray *tab_array; gint real_tab_width; - real_tab_width = calculate_real_tab_width (view, view->priv->tab_width, ' '); + real_tab_width = calculate_real_tab_width (view, priv->tab_width, ' '); if (real_tab_width < 0) { @@ -3060,7 +3076,7 @@ set_tab_stops_internal (GtkSourceView *view) gtk_text_view_set_tabs (GTK_TEXT_VIEW (view), tab_array); - view->priv->tabs_set = TRUE; + priv->tabs_set = TRUE; pango_tab_array_free (tab_array); @@ -3078,20 +3094,21 @@ set_tab_stops_internal (GtkSourceView *view) */ void gtk_source_view_set_tab_width (GtkSourceView *view, - guint width) + guint width) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); guint save_width; g_return_if_fail (GTK_SOURCE_VIEW (view)); g_return_if_fail (0 < width && width <= MAX_TAB_WIDTH); - if (view->priv->tab_width == width) + if (priv->tab_width == width) { return; } - save_width = view->priv->tab_width; - view->priv->tab_width = width; + save_width = priv->tab_width; + priv->tab_width = width; if (set_tab_stops_internal (view)) { g_object_notify (G_OBJECT (view), "tab-width"); @@ -3099,7 +3116,7 @@ gtk_source_view_set_tab_width (GtkSourceView *view, else { g_warning ("Impossible to set tab width."); - view->priv->tab_width = save_width; + priv->tab_width = save_width; } } @@ -3114,9 +3131,11 @@ gtk_source_view_set_tab_width (GtkSourceView *view, guint gtk_source_view_get_tab_width (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), DEFAULT_TAB_WIDTH); - return view->priv->tab_width; + return priv->tab_width; } /** @@ -3147,14 +3166,16 @@ gtk_source_view_get_tab_width (GtkSourceView *view) */ void gtk_source_view_set_indent_width (GtkSourceView *view, - gint width) + gint width) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_VIEW (view)); g_return_if_fail (width == -1 || (0 < width && width <= MAX_INDENT_WIDTH)); - if (view->priv->indent_width != width) + if (priv->indent_width != width) { - view->priv->indent_width = width; + priv->indent_width = width; g_object_notify (G_OBJECT (view), "indent-width"); } } @@ -3171,14 +3192,16 @@ gtk_source_view_set_indent_width (GtkSourceView *view, gint gtk_source_view_get_indent_width (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), 0); - return view->priv->indent_width; + return priv->indent_width; } static gchar * compute_indentation (GtkSourceView *view, - GtkTextIter *cur) + GtkTextIter *cur) { GtkTextIter start; GtkTextIter end; @@ -3215,14 +3238,16 @@ compute_indentation (GtkSourceView *view, static guint get_real_indent_width (GtkSourceView *view) { - return view->priv->indent_width < 0 ? - view->priv->tab_width : - (guint) view->priv->indent_width; + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + + return priv->indent_width < 0 ? + priv->tab_width : + (guint) priv->indent_width; } static gchar * get_indent_string (guint tabs, - guint spaces) + guint spaces) { gchar *str; @@ -3256,9 +3281,10 @@ get_indent_string (guint tabs, */ void gtk_source_view_indent_lines (GtkSourceView *view, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buf; gboolean bracket_hl; GtkTextMark *start_mark, *end_mark; @@ -3268,9 +3294,9 @@ gtk_source_view_indent_lines (GtkSourceView *view, guint spaces = 0; gint i; - if (view->priv->completion != NULL) + if (priv->completion != NULL) { - gtk_source_completion_block_interactive (view->priv->completion); + gtk_source_completion_block_interactive (priv->completion); } buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); @@ -3290,20 +3316,20 @@ gtk_source_view_indent_lines (GtkSourceView *view, end_line--; } - if (view->priv->insert_spaces) + if (priv->insert_spaces) { spaces = get_real_indent_width (view); tab_buffer = g_strnfill (spaces, ' '); } - else if (view->priv->indent_width > 0 && - view->priv->indent_width != (gint)view->priv->tab_width) + else if (priv->indent_width > 0 && + priv->indent_width != (gint)priv->tab_width) { guint indent_width; indent_width = get_real_indent_width (view); - spaces = indent_width % view->priv->tab_width; - tabs = indent_width / view->priv->tab_width; + spaces = indent_width % priv->tab_width; + tabs = indent_width / priv->tab_width; tab_buffer = get_indent_string (tabs, spaces); } @@ -3346,9 +3372,9 @@ gtk_source_view_indent_lines (GtkSourceView *view, /* if tabs are allowed try to merge the spaces * with the tab we are going to insert (if any) */ iter2 = iter; - while (!view->priv->insert_spaces && + while (!priv->insert_spaces && (gtk_text_iter_get_char (&iter2) == ' ') && - replaced_spaces < view->priv->tab_width) + replaced_spaces < priv->tab_width) { ++replaced_spaces; @@ -3360,8 +3386,8 @@ gtk_source_view_indent_lines (GtkSourceView *view, gchar *indent_buf; guint t, s; - t = tabs + (spaces + replaced_spaces) / view->priv->tab_width; - s = (spaces + replaced_spaces) % view->priv->tab_width; + t = tabs + (spaces + replaced_spaces) / priv->tab_width; + s = (spaces + replaced_spaces) % priv->tab_width; indent_buf = get_indent_string (t, s); gtk_text_buffer_delete (buf, &iter, &iter2); @@ -3381,9 +3407,9 @@ gtk_source_view_indent_lines (GtkSourceView *view, gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (buf), bracket_hl); - if (view->priv->completion != NULL) + if (priv->completion != NULL) { - gtk_source_completion_unblock_interactive (view->priv->completion); + gtk_source_completion_unblock_interactive (priv->completion); } gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (view), @@ -3410,9 +3436,10 @@ gtk_source_view_indent_lines (GtkSourceView *view, */ void gtk_source_view_unindent_lines (GtkSourceView *view, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buf; gboolean bracket_hl; GtkTextMark *start_mark, *end_mark; @@ -3421,9 +3448,9 @@ gtk_source_view_unindent_lines (GtkSourceView *view, gint indent_width; gint i; - if (view->priv->completion != NULL) + if (priv->completion != NULL) { - gtk_source_completion_block_interactive (view->priv->completion); + gtk_source_completion_block_interactive (priv->completion); } buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); @@ -3443,7 +3470,7 @@ gtk_source_view_unindent_lines (GtkSourceView *view, end_line--; } - tab_width = view->priv->tab_width; + tab_width = priv->tab_width; indent_width = get_real_indent_width (view); gtk_text_buffer_begin_user_action (buf); @@ -3493,9 +3520,9 @@ gtk_source_view_unindent_lines (GtkSourceView *view, gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (buf), bracket_hl); - if (view->priv->completion != NULL) + if (priv->completion != NULL) { - gtk_source_completion_unblock_interactive (view->priv->completion); + gtk_source_completion_unblock_interactive (priv->completion); } gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (view), @@ -3511,13 +3538,14 @@ gtk_source_view_unindent_lines (GtkSourceView *view, static gint get_line_offset_in_equivalent_spaces (GtkSourceView *view, - GtkTextIter *iter) + GtkTextIter *iter) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextIter i; gint tab_width; gint n = 0; - tab_width = view->priv->tab_width; + tab_width = priv->tab_width; i = *iter; gtk_text_iter_set_line_offset (&i, 0); @@ -3544,14 +3572,15 @@ get_line_offset_in_equivalent_spaces (GtkSourceView *view, static void insert_tab_or_spaces (GtkSourceView *view, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buf; gchar *tab_buf; gint cursor_offset = 0; - if (view->priv->insert_spaces) + if (priv->insert_spaces) { gint indent_width; gint pos; @@ -3565,8 +3594,8 @@ insert_tab_or_spaces (GtkSourceView *view, tab_buf = g_strnfill (spaces, ' '); } - else if (view->priv->indent_width > 0 && - view->priv->indent_width != (gint)view->priv->tab_width) + else if (priv->indent_width > 0 && + priv->indent_width != (gint)priv->tab_width) { GtkTextIter iter; gint i; @@ -3580,7 +3609,7 @@ insert_tab_or_spaces (GtkSourceView *view, gint tabs; gint spaces; - tab_width = view->priv->tab_width; + tab_width = priv->tab_width; indent_width = get_real_indent_width (view); /* CHECK: is this a performance problem? */ @@ -3655,7 +3684,7 @@ insert_tab_or_spaces (GtkSourceView *view, static void gtk_source_view_move_words (GtkSourceView *view, - gint step) + gint step) { GtkTextBuffer *buf; GtkTextIter s, e, ns, ne; @@ -3826,7 +3855,7 @@ remove_trailing_newline (GtkTextBuffer *buffer) static void gtk_source_view_move_lines (GtkSourceView *view, - gboolean down) + gboolean down) { GtkTextBuffer *buffer; GtkTextIter start; @@ -3928,6 +3957,7 @@ gtk_source_view_move_lines (GtkSourceView *view, static gboolean do_smart_backspace (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buffer; gboolean default_editable; GtkTextIter insert; @@ -3936,7 +3966,7 @@ do_smart_backspace (GtkSourceView *view) guint visual_column; gint indent_width; - buffer = GTK_TEXT_BUFFER (view->priv->source_buffer); + buffer = GTK_TEXT_BUFFER (priv->source_buffer); default_editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (view)); if (gtk_text_buffer_get_selection_bounds (buffer, &insert, &end)) @@ -3952,10 +3982,10 @@ do_smart_backspace (GtkSourceView *view) } visual_column = gtk_source_view_get_visual_column (view, &insert); - indent_width = view->priv->indent_width; + indent_width = priv->indent_width; if (indent_width <= 0) { - indent_width = view->priv->tab_width; + indent_width = priv->tab_width; } g_return_val_if_fail (indent_width > 0, FALSE); @@ -4000,13 +4030,14 @@ do_smart_backspace (GtkSourceView *view) static gboolean do_ctrl_backspace (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buffer; GtkTextIter insert; GtkTextIter end; GtkTextIter leading_end; gboolean default_editable; - buffer = GTK_TEXT_BUFFER (view->priv->source_buffer); + buffer = GTK_TEXT_BUFFER (priv->source_buffer); default_editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (view)); if (gtk_text_buffer_get_selection_bounds (buffer, &insert, &end)) @@ -4042,9 +4073,10 @@ do_ctrl_backspace (GtkSourceView *view) static gboolean gtk_source_view_key_press_event (GtkWidget *widget, - GdkEventKey *event) + GdkEventKey *event) { - GtkSourceView *view; + GtkSourceView *view = GTK_SOURCE_VIEW (widget); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buf; GtkTextIter cur; GtkTextMark *mark; @@ -4052,7 +4084,6 @@ gtk_source_view_key_press_event (GtkWidget *widget, gint key; gboolean editable; - view = GTK_SOURCE_VIEW (widget); buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (widget)); @@ -4068,7 +4099,7 @@ gtk_source_view_key_press_event (GtkWidget *widget, if ((key == GDK_KEY_Return || key == GDK_KEY_KP_Enter) && !(event->state & GDK_SHIFT_MASK) && - view->priv->auto_indent) + priv->auto_indent) { /* Auto-indent means that when you press ENTER at the end of a * line, the new line is automatically indented at the same @@ -4127,7 +4158,7 @@ gtk_source_view_key_press_event (GtkWidget *widget, has_selection = gtk_text_buffer_get_selection_bounds (buf, &s, &e); - if (view->priv->indent_on_tab) + if (priv->indent_on_tab) { /* shift+tab: always unindent */ if (event->state & GDK_SHIFT_MASK) @@ -4161,7 +4192,7 @@ gtk_source_view_key_press_event (GtkWidget *widget, { if ((event->state & modifiers) == 0) { - if (view->priv->smart_backspace && do_smart_backspace (view)) + if (priv->smart_backspace && do_smart_backspace (view)) { return GDK_EVENT_STOP; } @@ -4189,9 +4220,11 @@ gtk_source_view_key_press_event (GtkWidget *widget, gboolean gtk_source_view_get_auto_indent (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->auto_indent; + return priv->auto_indent; } /** @@ -4208,15 +4241,17 @@ gtk_source_view_get_auto_indent (GtkSourceView *view) */ void gtk_source_view_set_auto_indent (GtkSourceView *view, - gboolean enable) + gboolean enable) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); enable = enable != FALSE; - if (view->priv->auto_indent != enable) + if (priv->auto_indent != enable) { - view->priv->auto_indent = enable; + priv->auto_indent = enable; g_object_notify (G_OBJECT (view), "auto_indent"); } } @@ -4233,9 +4268,11 @@ gtk_source_view_set_auto_indent (GtkSourceView *view, gboolean gtk_source_view_get_insert_spaces_instead_of_tabs (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->insert_spaces; + return priv->insert_spaces; } /** @@ -4249,15 +4286,17 @@ gtk_source_view_get_insert_spaces_instead_of_tabs (GtkSourceView *view) */ void gtk_source_view_set_insert_spaces_instead_of_tabs (GtkSourceView *view, - gboolean enable) + gboolean enable) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); enable = enable != FALSE; - if (view->priv->insert_spaces != enable) + if (priv->insert_spaces != enable) { - view->priv->insert_spaces = enable; + priv->insert_spaces = enable; g_object_notify (G_OBJECT (view), "insert_spaces_instead_of_tabs"); } } @@ -4274,9 +4313,11 @@ gtk_source_view_set_insert_spaces_instead_of_tabs (GtkSourceView *view, gboolean gtk_source_view_get_indent_on_tab (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->indent_on_tab; + return priv->indent_on_tab; } /** @@ -4296,28 +4337,30 @@ gtk_source_view_get_indent_on_tab (GtkSourceView *view) */ void gtk_source_view_set_indent_on_tab (GtkSourceView *view, - gboolean enable) + gboolean enable) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); enable = enable != FALSE; - if (view->priv->indent_on_tab != enable) + if (priv->indent_on_tab != enable) { - view->priv->indent_on_tab = enable; + priv->indent_on_tab = enable; g_object_notify (G_OBJECT (view), "indent_on_tab"); } } static void view_dnd_drop (GtkTextView *view, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint info, - guint timestamp, - gpointer data) + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint timestamp, + gpointer data) { GtkTextIter iter; @@ -4410,9 +4453,11 @@ view_dnd_drop (GtkTextView *view, gboolean gtk_source_view_get_highlight_current_line (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->highlight_current_line; + return priv->highlight_current_line; } /** @@ -4424,15 +4469,17 @@ gtk_source_view_get_highlight_current_line (GtkSourceView *view) */ void gtk_source_view_set_highlight_current_line (GtkSourceView *view, - gboolean highlight) + gboolean highlight) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); highlight = highlight != FALSE; - if (view->priv->highlight_current_line != highlight) + if (priv->highlight_current_line != highlight) { - view->priv->highlight_current_line = highlight; + priv->highlight_current_line = highlight; gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -4451,9 +4498,11 @@ gtk_source_view_set_highlight_current_line (GtkSourceView *view, gboolean gtk_source_view_get_show_right_margin (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->show_right_margin; + return priv->show_right_margin; } /** @@ -4465,15 +4514,17 @@ gtk_source_view_get_show_right_margin (GtkSourceView *view) */ void gtk_source_view_set_show_right_margin (GtkSourceView *view, - gboolean show) + gboolean show) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); show = show != FALSE; - if (view->priv->show_right_margin != show) + if (priv->show_right_margin != show) { - view->priv->show_right_margin = show; + priv->show_right_margin = show; gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -4492,9 +4543,11 @@ gtk_source_view_set_show_right_margin (GtkSourceView *view, guint gtk_source_view_get_right_margin_position (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), DEFAULT_RIGHT_MARGIN_POSITION); - return view->priv->right_margin_pos; + return priv->right_margin_pos; } /** @@ -4506,15 +4559,17 @@ gtk_source_view_get_right_margin_position (GtkSourceView *view) */ void gtk_source_view_set_right_margin_position (GtkSourceView *view, - guint pos) + guint pos) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); g_return_if_fail (1 <= pos && pos <= MAX_RIGHT_MARGIN_POSITION); - if (view->priv->right_margin_pos != pos) + if (priv->right_margin_pos != pos) { - view->priv->right_margin_pos = pos; - view->priv->cached_right_margin_pos = -1; + priv->right_margin_pos = pos; + priv->cached_right_margin_pos = -1; gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -4536,13 +4591,15 @@ void gtk_source_view_set_smart_backspace (GtkSourceView *view, gboolean smart_backspace) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); smart_backspace = smart_backspace != FALSE; - if (smart_backspace != view->priv->smart_backspace) + if (smart_backspace != priv->smart_backspace) { - view->priv->smart_backspace = smart_backspace; + priv->smart_backspace = smart_backspace; g_object_notify (G_OBJECT (view), "smart-backspace"); } } @@ -4561,9 +4618,11 @@ gtk_source_view_set_smart_backspace (GtkSourceView *view, gboolean gtk_source_view_get_smart_backspace (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->smart_backspace; + return priv->smart_backspace; } /** @@ -4576,13 +4635,15 @@ gtk_source_view_get_smart_backspace (GtkSourceView *view) */ void gtk_source_view_set_smart_home_end (GtkSourceView *view, - GtkSourceSmartHomeEndType smart_home_end) + GtkSourceSmartHomeEndType smart_home_end) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); - if (view->priv->smart_home_end != smart_home_end) + if (priv->smart_home_end != smart_home_end) { - view->priv->smart_home_end = smart_home_end; + priv->smart_home_end = smart_home_end; g_object_notify (G_OBJECT (view), "smart_home_end"); } } @@ -4599,9 +4660,11 @@ gtk_source_view_set_smart_home_end (GtkSourceView *view, GtkSourceSmartHomeEndType gtk_source_view_get_smart_home_end (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE); - return view->priv->smart_home_end; + return priv->smart_home_end; } /** @@ -4616,8 +4679,9 @@ gtk_source_view_get_smart_home_end (GtkSourceView *view) */ guint gtk_source_view_get_visual_column (GtkSourceView *view, - const GtkTextIter *iter) + const GtkTextIter *iter) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextIter position; guint column; guint tab_width; @@ -4626,7 +4690,7 @@ gtk_source_view_get_visual_column (GtkSourceView *view, g_return_val_if_fail (iter != NULL, 0); column = 0; - tab_width = view->priv->tab_width; + tab_width = priv->tab_width; position = *iter; gtk_text_iter_set_line_offset (&position, 0); @@ -4656,53 +4720,58 @@ gtk_source_view_get_visual_column (GtkSourceView *view, static void update_background_pattern_color (GtkSourceView *view) { - if (view->priv->style_scheme == NULL) + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + + if (priv->style_scheme == NULL) { - view->priv->background_pattern_color_set = FALSE; + priv->background_pattern_color_set = FALSE; return; } - view->priv->background_pattern_color_set = - _gtk_source_style_scheme_get_background_pattern_color (view->priv->style_scheme, - &view->priv->background_pattern_color); + priv->background_pattern_color_set = + _gtk_source_style_scheme_get_background_pattern_color (priv->style_scheme, + &priv->background_pattern_color); } static void update_current_line_color (GtkSourceView *view) { - if (view->priv->style_scheme == NULL) + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + + if (priv->style_scheme == NULL) { - view->priv->current_line_color_set = FALSE; + priv->current_line_color_set = FALSE; return; } - view->priv->current_line_color_set = - _gtk_source_style_scheme_get_current_line_color (view->priv->style_scheme, - &view->priv->current_line_color); + priv->current_line_color_set = + _gtk_source_style_scheme_get_current_line_color (priv->style_scheme, + &priv->current_line_color); } static void update_right_margin_colors (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkWidget *widget = GTK_WIDGET (view); - if (view->priv->right_margin_line_color != NULL) + if (priv->right_margin_line_color != NULL) { - gdk_rgba_free (view->priv->right_margin_line_color); - view->priv->right_margin_line_color = NULL; + gdk_rgba_free (priv->right_margin_line_color); + priv->right_margin_line_color = NULL; } - if (view->priv->right_margin_overlay_color != NULL) + if (priv->right_margin_overlay_color != NULL) { - gdk_rgba_free (view->priv->right_margin_overlay_color); - view->priv->right_margin_overlay_color = NULL; + gdk_rgba_free (priv->right_margin_overlay_color); + priv->right_margin_overlay_color = NULL; } - if (view->priv->style_scheme != NULL) + if (priv->style_scheme != NULL) { GtkSourceStyle *style; - style = _gtk_source_style_scheme_get_right_margin_style (view->priv->style_scheme); + style = _gtk_source_style_scheme_get_right_margin_style (priv->style_scheme); if (style != NULL) { @@ -4719,8 +4788,8 @@ update_right_margin_colors (GtkSourceView *view) color_str != NULL && gdk_rgba_parse (&color, color_str)) { - view->priv->right_margin_line_color = gdk_rgba_copy (&color); - view->priv->right_margin_line_color->alpha = + priv->right_margin_line_color = gdk_rgba_copy (&color); + priv->right_margin_line_color->alpha = RIGHT_MARGIN_LINE_ALPHA / 255.; } @@ -4736,8 +4805,8 @@ update_right_margin_colors (GtkSourceView *view) color_str != NULL && gdk_rgba_parse (&color, color_str)) { - view->priv->right_margin_overlay_color = gdk_rgba_copy (&color); - view->priv->right_margin_overlay_color->alpha = + priv->right_margin_overlay_color = gdk_rgba_copy (&color); + priv->right_margin_overlay_color->alpha = RIGHT_MARGIN_OVERLAY_ALPHA / 255.; } @@ -4745,7 +4814,7 @@ update_right_margin_colors (GtkSourceView *view) } } - if (view->priv->right_margin_line_color == NULL) + if (priv->right_margin_line_color == NULL) { GtkStyleContext *context; GdkRGBA color; @@ -4758,8 +4827,8 @@ update_right_margin_colors (GtkSourceView *view) &color); gtk_style_context_restore (context); - view->priv->right_margin_line_color = gdk_rgba_copy (&color); - view->priv->right_margin_line_color->alpha = + priv->right_margin_line_color = gdk_rgba_copy (&color); + priv->right_margin_line_color->alpha = RIGHT_MARGIN_LINE_ALPHA / 255.; } } @@ -4767,13 +4836,15 @@ update_right_margin_colors (GtkSourceView *view) static void update_style (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + update_background_pattern_color (view); update_current_line_color (view); update_right_margin_colors (view); - if (view->priv->space_drawer != NULL) + if (priv->space_drawer != NULL) { - _gtk_source_space_drawer_update_color (view->priv->space_drawer, view); + _gtk_source_space_drawer_update_color (priv->space_drawer, view); } gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -4782,6 +4853,7 @@ update_style (GtkSourceView *view) static void gtk_source_view_update_style_scheme (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); GtkTextBuffer *buffer; GtkSourceStyleScheme *new_scheme = NULL; @@ -4792,21 +4864,21 @@ gtk_source_view_update_style_scheme (GtkSourceView *view) new_scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (buffer)); } - if (view->priv->style_scheme == new_scheme) + if (priv->style_scheme == new_scheme) { return; } - if (view->priv->style_scheme != NULL) + if (priv->style_scheme != NULL) { - _gtk_source_style_scheme_unapply (view->priv->style_scheme, view); + _gtk_source_style_scheme_unapply (priv->style_scheme, view); } - g_set_object (&view->priv->style_scheme, new_scheme); + g_set_object (&priv->style_scheme, new_scheme); - if (view->priv->style_scheme != NULL) + if (priv->style_scheme != NULL) { - _gtk_source_style_scheme_apply (view->priv->style_scheme, view); + _gtk_source_style_scheme_apply (priv->style_scheme, view); } update_style (view); @@ -4816,6 +4888,7 @@ static void gtk_source_view_style_updated (GtkWidget *widget) { GtkSourceView *view = GTK_SOURCE_VIEW (widget); + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); /* Call default handler first. */ if (GTK_WIDGET_CLASS (gtk_source_view_parent_class)->style_updated != NULL) @@ -4826,20 +4899,20 @@ gtk_source_view_style_updated (GtkWidget *widget) /* Re-set tab stops, but only if we already modified them, i.e. * do nothing with good old 8-space tabs. */ - if (view->priv->tabs_set) + if (priv->tabs_set) { set_tab_stops_internal (view); } /* Make sure the margin position is recalculated on next redraw. */ - view->priv->cached_right_margin_pos = -1; + priv->cached_right_margin_pos = -1; update_style (view); } static MarkCategory * mark_category_new (GtkSourceMarkAttributes *attributes, - gint priority) + gint priority) { MarkCategory* category = g_slice_new (MarkCategory); @@ -4872,14 +4945,16 @@ mark_category_free (MarkCategory *category) GtkSourceCompletion * gtk_source_view_get_completion (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL); - if (view->priv->completion == NULL) + if (priv->completion == NULL) { - view->priv->completion = gtk_source_completion_new (view); + priv->completion = gtk_source_completion_new (view); } - return view->priv->completion; + return priv->completion; } /** @@ -4898,29 +4973,31 @@ gtk_source_view_get_completion (GtkSourceView *view) */ GtkSourceGutter * gtk_source_view_get_gutter (GtkSourceView *view, - GtkTextWindowType window_type) + GtkTextWindowType window_type) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL); g_return_val_if_fail (window_type == GTK_TEXT_WINDOW_LEFT || window_type == GTK_TEXT_WINDOW_RIGHT, NULL); if (window_type == GTK_TEXT_WINDOW_LEFT) { - if (view->priv->left_gutter == NULL) + if (priv->left_gutter == NULL) { - view->priv->left_gutter = _gtk_source_gutter_new (view, window_type); + priv->left_gutter = _gtk_source_gutter_new (view, window_type); } - return view->priv->left_gutter; + return priv->left_gutter; } else { - if (view->priv->right_gutter == NULL) + if (priv->right_gutter == NULL) { - view->priv->right_gutter = _gtk_source_gutter_new (view, window_type); + priv->right_gutter = _gtk_source_gutter_new (view, window_type); } - return view->priv->right_gutter; + return priv->right_gutter; } } @@ -4935,10 +5012,11 @@ gtk_source_view_get_gutter (GtkSourceView *view, */ void gtk_source_view_set_mark_attributes (GtkSourceView *view, - const gchar *category, - GtkSourceMarkAttributes *attributes, - gint priority) + const gchar *category, + GtkSourceMarkAttributes *attributes, + gint priority) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); MarkCategory *mark_category; g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); @@ -4947,7 +5025,7 @@ gtk_source_view_set_mark_attributes (GtkSourceView *view, g_return_if_fail (priority >= 0); mark_category = mark_category_new (attributes, priority); - g_hash_table_replace (view->priv->mark_categories, + g_hash_table_replace (priv->mark_categories, g_strdup (category), mark_category); } @@ -4965,15 +5043,16 @@ gtk_source_view_set_mark_attributes (GtkSourceView *view, */ GtkSourceMarkAttributes * gtk_source_view_get_mark_attributes (GtkSourceView *view, - const gchar *category, - gint *priority) + const gchar *category, + gint *priority) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); MarkCategory *mark_category; g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL); g_return_val_if_fail (category != NULL, NULL); - mark_category = g_hash_table_lookup (view->priv->mark_categories, + mark_category = g_hash_table_lookup (priv->mark_categories, category); if (mark_category != NULL) @@ -5000,13 +5079,15 @@ gtk_source_view_get_mark_attributes (GtkSourceView *view, */ void gtk_source_view_set_background_pattern (GtkSourceView *view, - GtkSourceBackgroundPatternType background_pattern) + GtkSourceBackgroundPatternType background_pattern) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); - if (view->priv->background_pattern != background_pattern) + if (priv->background_pattern != background_pattern) { - view->priv->background_pattern = background_pattern; + priv->background_pattern = background_pattern; gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -5027,9 +5108,11 @@ gtk_source_view_set_background_pattern (GtkSourceView *view, GtkSourceBackgroundPatternType gtk_source_view_get_background_pattern (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), GTK_SOURCE_BACKGROUND_PATTERN_TYPE_NONE); - return view->priv->background_pattern; + return priv->background_pattern; } /** @@ -5046,7 +5129,9 @@ gtk_source_view_get_background_pattern (GtkSourceView *view) GtkSourceSpaceDrawer * gtk_source_view_get_space_drawer (GtkSourceView *view) { + GtkSourceViewPrivate *priv = gtk_source_view_get_instance_private (view); + g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL); - return view->priv->space_drawer; + return priv->space_drawer; } diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h index 81fc7c4f..41da6425 100644 --- a/gtksourceview/gtksourceview.h +++ b/gtksourceview/gtksourceview.h @@ -31,15 +31,7 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_VIEW (gtk_source_view_get_type ()) -#define GTK_SOURCE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_VIEW, GtkSourceView)) -#define GTK_SOURCE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_VIEW, GtkSourceViewClass)) -#define GTK_SOURCE_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_VIEW)) -#define GTK_SOURCE_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_VIEW)) -#define GTK_SOURCE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_VIEW, GtkSourceViewClass)) - -typedef struct _GtkSourceViewClass GtkSourceViewClass; -typedef struct _GtkSourceViewPrivate GtkSourceViewPrivate; +#define GTK_SOURCE_TYPE_VIEW (gtk_source_view_get_type()) /** * GtkSourceViewGutterPosition: @@ -87,177 +79,123 @@ typedef enum _GtkSourceBackgroundPatternType GTK_SOURCE_BACKGROUND_PATTERN_TYPE_GRID } GtkSourceBackgroundPatternType; -struct _GtkSourceView -{ - GtkTextView parent; - - GtkSourceViewPrivate *priv; -}; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourceView, gtk_source_view, GTK_SOURCE, VIEW, GtkTextView) struct _GtkSourceViewClass { GtkTextViewClass parent_class; - void (*undo) (GtkSourceView *view); - void (*redo) (GtkSourceView *view); + void (*undo) (GtkSourceView *view); + void (*redo) (GtkSourceView *view); void (*line_mark_activated) (GtkSourceView *view, GtkTextIter *iter, GdkEvent *event); - void (*show_completion) (GtkSourceView *view); - void (*move_lines) (GtkSourceView *view, - gboolean down); - - void (*move_words) (GtkSourceView *view, - gint step); - - /* Padding for future expansion */ - gpointer padding[20]; + void (*show_completion) (GtkSourceView *view); + void (*move_lines) (GtkSourceView *view, + gboolean down); + void (*move_words) (GtkSourceView *view, + gint step); + + /*< private >*/ + gpointer _reserved[20]; }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_view_get_type (void) G_GNUC_CONST; - +GtkWidget *gtk_source_view_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -GtkWidget *gtk_source_view_new (void); - -GTK_SOURCE_AVAILABLE_IN_ALL -GtkWidget *gtk_source_view_new_with_buffer (GtkSourceBuffer *buffer); - +GtkWidget *gtk_source_view_new_with_buffer (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_show_line_numbers (GtkSourceView *view, - gboolean show); - +void gtk_source_view_set_show_line_numbers (GtkSourceView *view, + gboolean show); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_show_line_numbers (GtkSourceView *view); - +gboolean gtk_source_view_get_show_line_numbers (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_tab_width (GtkSourceView *view, - guint width); - +void gtk_source_view_set_tab_width (GtkSourceView *view, + guint width); GTK_SOURCE_AVAILABLE_IN_ALL -guint gtk_source_view_get_tab_width (GtkSourceView *view); - +guint gtk_source_view_get_tab_width (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_indent_width (GtkSourceView *view, - gint width); - +void gtk_source_view_set_indent_width (GtkSourceView *view, + gint width); GTK_SOURCE_AVAILABLE_IN_ALL -gint gtk_source_view_get_indent_width (GtkSourceView *view); - +gint gtk_source_view_get_indent_width (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_auto_indent (GtkSourceView *view, - gboolean enable); - +void gtk_source_view_set_auto_indent (GtkSourceView *view, + gboolean enable); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_auto_indent (GtkSourceView *view); - +gboolean gtk_source_view_get_auto_indent (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_insert_spaces_instead_of_tabs - (GtkSourceView *view, - gboolean enable); - +void gtk_source_view_set_insert_spaces_instead_of_tabs (GtkSourceView *view, + gboolean enable); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_insert_spaces_instead_of_tabs - (GtkSourceView *view); - +gboolean gtk_source_view_get_insert_spaces_instead_of_tabs (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_indent_on_tab (GtkSourceView *view, - gboolean enable); - +void gtk_source_view_set_indent_on_tab (GtkSourceView *view, + gboolean enable); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_indent_on_tab (GtkSourceView *view); - +gboolean gtk_source_view_get_indent_on_tab (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_3_16 -void gtk_source_view_indent_lines (GtkSourceView *view, - GtkTextIter *start, - GtkTextIter *end); - +void gtk_source_view_indent_lines (GtkSourceView *view, + GtkTextIter *start, + GtkTextIter *end); GTK_SOURCE_AVAILABLE_IN_3_16 -void gtk_source_view_unindent_lines (GtkSourceView *view, - GtkTextIter *start, - GtkTextIter *end); - +void gtk_source_view_unindent_lines (GtkSourceView *view, + GtkTextIter *start, + GtkTextIter *end); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_highlight_current_line - (GtkSourceView *view, - gboolean highlight); - +void gtk_source_view_set_highlight_current_line (GtkSourceView *view, + gboolean highlight); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_highlight_current_line - (GtkSourceView *view); - +gboolean gtk_source_view_get_highlight_current_line (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_show_right_margin (GtkSourceView *view, - gboolean show); - +void gtk_source_view_set_show_right_margin (GtkSourceView *view, + gboolean show); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_show_right_margin (GtkSourceView *view); - +gboolean gtk_source_view_get_show_right_margin (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_right_margin_position - (GtkSourceView *view, - guint pos); - +void gtk_source_view_set_right_margin_position (GtkSourceView *view, + guint pos); GTK_SOURCE_AVAILABLE_IN_ALL -guint gtk_source_view_get_right_margin_position - (GtkSourceView *view); - +guint gtk_source_view_get_right_margin_position (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_show_line_marks (GtkSourceView *view, - gboolean show); - +void gtk_source_view_set_show_line_marks (GtkSourceView *view, + gboolean show); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_view_get_show_line_marks (GtkSourceView *view); - +gboolean gtk_source_view_get_show_line_marks (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_mark_attributes (GtkSourceView *view, - const gchar *category, - GtkSourceMarkAttributes *attributes, - gint priority); - +void gtk_source_view_set_mark_attributes (GtkSourceView *view, + const gchar *category, + GtkSourceMarkAttributes *attributes, + gint priority); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceMarkAttributes * - gtk_source_view_get_mark_attributes (GtkSourceView *view, - const gchar *category, - gint *priority); - +GtkSourceMarkAttributes *gtk_source_view_get_mark_attributes (GtkSourceView *view, + const gchar *category, + gint *priority); GTK_SOURCE_AVAILABLE_IN_3_18 -void gtk_source_view_set_smart_backspace (GtkSourceView *view, - gboolean smart_backspace); - +void gtk_source_view_set_smart_backspace (GtkSourceView *view, + gboolean smart_backspace); GTK_SOURCE_AVAILABLE_IN_3_18 -gboolean gtk_source_view_get_smart_backspace (GtkSourceView *view); - +gboolean gtk_source_view_get_smart_backspace (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_view_set_smart_home_end (GtkSourceView *view, - GtkSourceSmartHomeEndType smart_home_end); - +void gtk_source_view_set_smart_home_end (GtkSourceView *view, + GtkSourceSmartHomeEndType smart_home_end); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceSmartHomeEndType - gtk_source_view_get_smart_home_end (GtkSourceView *view); - +GtkSourceSmartHomeEndType gtk_source_view_get_smart_home_end (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -guint gtk_source_view_get_visual_column (GtkSourceView *view, - const GtkTextIter *iter); - +guint gtk_source_view_get_visual_column (GtkSourceView *view, + const GtkTextIter *iter); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceCompletion * - gtk_source_view_get_completion (GtkSourceView *view); - +GtkSourceCompletion *gtk_source_view_get_completion (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceGutter *gtk_source_view_get_gutter (GtkSourceView *view, - GtkTextWindowType window_type); - +GtkSourceGutter *gtk_source_view_get_gutter (GtkSourceView *view, + GtkTextWindowType window_type); GTK_SOURCE_AVAILABLE_IN_3_16 -void gtk_source_view_set_background_pattern (GtkSourceView *view, - GtkSourceBackgroundPatternType background_pattern); - +void gtk_source_view_set_background_pattern (GtkSourceView *view, + GtkSourceBackgroundPatternType background_pattern); GTK_SOURCE_AVAILABLE_IN_3_16 -GtkSourceBackgroundPatternType - gtk_source_view_get_background_pattern (GtkSourceView *view); - +GtkSourceBackgroundPatternType gtk_source_view_get_background_pattern (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_3_24 -GtkSourceSpaceDrawer * - gtk_source_view_get_space_drawer (GtkSourceView *view); +GtkSourceSpaceDrawer *gtk_source_view_get_space_drawer (GtkSourceView *view); G_END_DECLS -- GitLab From 3fc476ac498d4ede093fd8cb6a1ee23a3949de98 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 09:52:38 -0800 Subject: [PATCH 024/248] map: modernize GtkSourceMap - Use G_DECLARE_ macros --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcemap.h | 32 ++++++++------------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 7f6959b7..919b484f 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceMap, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourcePrintCompositor, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchSettings, g_object_unref) diff --git a/gtksourceview/gtksourcemap.h b/gtksourceview/gtksourcemap.h index d22d85a8..5de357ac 100644 --- a/gtksourceview/gtksourcemap.h +++ b/gtksourceview/gtksourcemap.h @@ -29,39 +29,25 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_MAP (gtk_source_map_get_type()) -#define GTK_SOURCE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_MAP, GtkSourceMap)) -#define GTK_SOURCE_MAP_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_MAP, GtkSourceMap const)) -#define GTK_SOURCE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_MAP, GtkSourceMapClass)) -#define GTK_SOURCE_IS_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_MAP)) -#define GTK_SOURCE_IS_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_MAP)) -#define GTK_SOURCE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_MAP, GtkSourceMapClass)) +#define GTK_SOURCE_TYPE_MAP (gtk_source_map_get_type()) -typedef struct _GtkSourceMapClass GtkSourceMapClass; - -struct _GtkSourceMap -{ - GtkSourceView parent_instance; -}; +GTK_SOURCE_AVAILABLE_IN_3_18 +G_DECLARE_DERIVABLE_TYPE (GtkSourceMap, gtk_source_map, GTK_SOURCE, MAP, GtkSourceView) struct _GtkSourceMapClass { GtkSourceViewClass parent_class; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_3_18 -GType gtk_source_map_get_type (void); - -GTK_SOURCE_AVAILABLE_IN_3_18 -GtkWidget *gtk_source_map_new (void); - +GtkWidget *gtk_source_map_new (void); GTK_SOURCE_AVAILABLE_IN_3_18 -void gtk_source_map_set_view (GtkSourceMap *map, - GtkSourceView *view); - +void gtk_source_map_set_view (GtkSourceMap *map, + GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_3_18 -GtkSourceView *gtk_source_map_get_view (GtkSourceMap *map); +GtkSourceView *gtk_source_map_get_view (GtkSourceMap *map); G_END_DECLS -- GitLab From 9acb464901f955fdc97917f0f2508cca6cea4af3 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 09:53:00 -0800 Subject: [PATCH 025/248] build: require c11 We should bump this early so that it is clear we are requiring a more modern set of compiler requirements going forward. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6e55c3a1..19ea3771 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('gtksourceview', 'c', version: '4.99.0', license: 'LGPL-2.1-or-later', meson_version: '>= 0.50.0', - default_options: [ 'c_std=gnu99', + default_options: [ 'c_std=gnu11', 'buildtype=debugoptimized', 'warning_level=2' ], ) -- GitLab From 51eefe14369ee968eb5a3141bceeaca95eb774e2 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:04:22 -0800 Subject: [PATCH 026/248] print: modernize GtkSourcePrintCompositor - Use G_DECLARE_ macros - Fix multi-line function indentation - Use get_instance_private() --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourceprintcompositor.c | 952 +++++++++++++---------- gtksourceview/gtksourceprintcompositor.h | 216 ++--- 3 files changed, 600 insertions(+), 569 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 919b484f..c2aebf57 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourcePrintCompositor, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchSettings, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSpaceDrawer, g_object_unref) diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtksourceprintcompositor.c index f152cfba..0bc23b27 100644 --- a/gtksourceview/gtksourceprintcompositor.c +++ b/gtksourceview/gtksourceprintcompositor.c @@ -102,7 +102,7 @@ typedef enum _PaginatorState DONE } PaginatorState; -struct _GtkSourcePrintCompositorPrivate +typedef struct { GtkSourceBuffer *buffer; @@ -174,7 +174,7 @@ struct _GtkSourcePrintCompositorPrivate PangoLanguage *language; /* must not be freed */ GtkTextMark *pagination_mark; -}; +} GtkSourcePrintCompositorPrivate; enum { @@ -199,7 +199,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSourcePrintCompositor, gtk_source_print_composito #define POINTS_PER_INCH 72 static gdouble -convert_to_mm (gdouble len, GtkUnit unit) +convert_to_mm (gdouble len, + GtkUnit unit) { switch (unit) { @@ -220,7 +221,8 @@ convert_to_mm (gdouble len, GtkUnit unit) } static gdouble -convert_from_mm (gdouble len, GtkUnit unit) +convert_from_mm (gdouble len, + GtkUnit unit) { switch (unit) { @@ -242,16 +244,17 @@ convert_from_mm (gdouble len, GtkUnit unit) static void gtk_source_print_compositor_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourcePrintCompositor *compositor = GTK_SOURCE_PRINT_COMPOSITOR (object); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); switch (prop_id) { case PROP_BUFFER: - g_value_set_object (value, compositor->priv->buffer); + g_value_set_object (value, priv->buffer); break; case PROP_TAB_WIDTH: g_value_set_uint (value, @@ -305,16 +308,17 @@ gtk_source_print_compositor_get_property (GObject *object, static void gtk_source_print_compositor_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourcePrintCompositor *compositor = GTK_SOURCE_PRINT_COMPOSITOR (object); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); switch (prop_id) { case PROP_BUFFER: - compositor->priv->buffer = GTK_SOURCE_BUFFER (g_value_dup_object (value)); + priv->buffer = GTK_SOURCE_BUFFER (g_value_dup_object (value)); break; case PROP_TAB_WIDTH: gtk_source_print_compositor_set_tab_width (compositor, @@ -364,42 +368,41 @@ gtk_source_print_compositor_set_property (GObject *object, static void gtk_source_print_compositor_finalize (GObject *object) { - GtkSourcePrintCompositor *compositor; - - compositor = GTK_SOURCE_PRINT_COMPOSITOR (object); + GtkSourcePrintCompositor *compositor = GTK_SOURCE_PRINT_COMPOSITOR (object); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); - if (compositor->priv->pages != NULL) - g_array_free (compositor->priv->pages, TRUE); + if (priv->pages != NULL) + g_array_free (priv->pages, TRUE); - if (compositor->priv->layout != NULL) - g_object_unref (compositor->priv->layout); + if (priv->layout != NULL) + g_object_unref (priv->layout); - if (compositor->priv->line_numbers_layout != NULL) - g_object_unref (compositor->priv->line_numbers_layout); + if (priv->line_numbers_layout != NULL) + g_object_unref (priv->line_numbers_layout); - if (compositor->priv->header_layout != NULL) - g_object_unref (compositor->priv->header_layout); + if (priv->header_layout != NULL) + g_object_unref (priv->header_layout); - if (compositor->priv->footer_layout != NULL) - g_object_unref (compositor->priv->footer_layout); + if (priv->footer_layout != NULL) + g_object_unref (priv->footer_layout); - pango_font_description_free (compositor->priv->body_font); + pango_font_description_free (priv->body_font); - if (compositor->priv->line_numbers_font != NULL) - pango_font_description_free (compositor->priv->line_numbers_font); + if (priv->line_numbers_font != NULL) + pango_font_description_free (priv->line_numbers_font); - if (compositor->priv->header_font != NULL) - pango_font_description_free (compositor->priv->header_font); + if (priv->header_font != NULL) + pango_font_description_free (priv->header_font); - if (compositor->priv->footer_font != NULL) - pango_font_description_free (compositor->priv->footer_font); + if (priv->footer_font != NULL) + pango_font_description_free (priv->footer_font); - g_free (compositor->priv->header_format_left); - g_free (compositor->priv->header_format_right); - g_free (compositor->priv->header_format_center); - g_free (compositor->priv->footer_format_left); - g_free (compositor->priv->footer_format_right); - g_free (compositor->priv->footer_format_center); + g_free (priv->header_format_left); + g_free (priv->header_format_right); + g_free (priv->header_format_center); + g_free (priv->footer_format_left); + g_free (priv->footer_format_right); + g_free (priv->footer_format_center); G_OBJECT_CLASS (gtk_source_print_compositor_parent_class)->finalize (object); } @@ -407,11 +410,10 @@ gtk_source_print_compositor_finalize (GObject *object) static void gtk_source_print_compositor_dispose (GObject *object) { - GtkSourcePrintCompositor *compositor; - - compositor = GTK_SOURCE_PRINT_COMPOSITOR (object); + GtkSourcePrintCompositor *compositor = GTK_SOURCE_PRINT_COMPOSITOR (object); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); - g_clear_object (&compositor->priv->buffer); + g_clear_object (&priv->buffer); G_OBJECT_CLASS (gtk_source_print_compositor_parent_class)->dispose (object); } @@ -689,11 +691,7 @@ gtk_source_print_compositor_class_init (GtkSourcePrintCompositorClass *klass) static void gtk_source_print_compositor_init (GtkSourcePrintCompositor *compositor) { - GtkSourcePrintCompositorPrivate *priv; - - priv = gtk_source_print_compositor_get_instance_private (compositor); - - compositor->priv = priv; + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); priv->buffer = NULL; @@ -791,6 +789,7 @@ gtk_source_print_compositor_new_from_view (GtkSourceView *view) PangoContext *pango_context; PangoFontDescription* font_desc; GtkSourcePrintCompositor *compositor; + GtkSourcePrintCompositorPrivate *priv; g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL); g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))), NULL); @@ -805,13 +804,14 @@ gtk_source_print_compositor_new_from_view (GtkSourceView *view) "wrap-mode", gtk_text_view_get_wrap_mode (GTK_TEXT_VIEW (view)), "print-line-numbers", (gtk_source_view_get_show_line_numbers (view) == FALSE) ? 0 : 1, NULL)); + priv = gtk_source_print_compositor_get_instance_private (compositor); /* Set the body font directly since the property get a name while body_font is a PangoFontDescription */ pango_context = gtk_widget_get_pango_context (GTK_WIDGET (view)); font_desc = pango_context_get_font_description (pango_context); - compositor->priv->body_font = pango_font_description_copy (font_desc); + priv->body_font = pango_font_description_copy (font_desc); g_object_notify (G_OBJECT (compositor), "body-font-name"); /* FIXME: is this needed? */ return compositor; @@ -832,9 +832,11 @@ gtk_source_print_compositor_new_from_view (GtkSourceView *view) GtkSourceBuffer * gtk_source_print_compositor_get_buffer (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL); - return compositor->priv->buffer; + return priv->buffer; } /** @@ -851,16 +853,18 @@ gtk_source_print_compositor_get_buffer (GtkSourcePrintCompositor *compositor) */ void gtk_source_print_compositor_set_tab_width (GtkSourcePrintCompositor *compositor, - guint width) + guint width) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); g_return_if_fail (width > 0 && width <= MAX_TAB_WIDTH); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); - if (width == compositor->priv->tab_width) + if (width == priv->tab_width) return; - compositor->priv->tab_width = width; + priv->tab_width = width; g_object_notify (G_OBJECT (compositor), "tab-width"); } @@ -878,9 +882,11 @@ gtk_source_print_compositor_set_tab_width (GtkSourcePrintCompositor *compositor, guint gtk_source_print_compositor_get_tab_width (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), DEFAULT_TAB_WIDTH); - return compositor->priv->tab_width; + return priv->tab_width; } /** @@ -897,15 +903,17 @@ gtk_source_print_compositor_get_tab_width (GtkSourcePrintCompositor *compositor) */ void gtk_source_print_compositor_set_wrap_mode (GtkSourcePrintCompositor *compositor, - GtkWrapMode wrap_mode) + GtkWrapMode wrap_mode) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); - if (wrap_mode == compositor->priv->wrap_mode) + if (wrap_mode == priv->wrap_mode) return; - compositor->priv->wrap_mode = wrap_mode; + priv->wrap_mode = wrap_mode; g_object_notify (G_OBJECT (compositor), "wrap-mode"); } @@ -923,9 +931,11 @@ gtk_source_print_compositor_set_wrap_mode (GtkSourcePrintCompositor *compositor, GtkWrapMode gtk_source_print_compositor_get_wrap_mode (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), GTK_WRAP_NONE); - return compositor->priv->wrap_mode; + return priv->wrap_mode; } /** @@ -943,17 +953,19 @@ gtk_source_print_compositor_get_wrap_mode (GtkSourcePrintCompositor *compositor) **/ void gtk_source_print_compositor_set_highlight_syntax (GtkSourcePrintCompositor *compositor, - gboolean highlight) + gboolean highlight) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); highlight = (highlight != FALSE); - if (highlight == compositor->priv->highlight_syntax) + if (highlight == priv->highlight_syntax) return; - compositor->priv->highlight_syntax = highlight; + priv->highlight_syntax = highlight; g_object_notify (G_OBJECT (compositor), "highlight-syntax"); } @@ -973,9 +985,11 @@ gtk_source_print_compositor_set_highlight_syntax (GtkSourcePrintCompositor *comp gboolean gtk_source_print_compositor_get_highlight_syntax (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), FALSE); - return compositor->priv->highlight_syntax; + return priv->highlight_syntax; } /** @@ -996,16 +1010,18 @@ gtk_source_print_compositor_get_highlight_syntax (GtkSourcePrintCompositor *comp **/ void gtk_source_print_compositor_set_print_line_numbers (GtkSourcePrintCompositor *compositor, - guint interval) + guint interval) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); g_return_if_fail (interval <= 100); - if (interval == compositor->priv->print_line_numbers) + if (interval == priv->print_line_numbers) return; - compositor->priv->print_line_numbers = interval; + priv->print_line_numbers = interval; g_object_notify (G_OBJECT (compositor), "print-line-numbers"); } @@ -1030,17 +1046,19 @@ gtk_source_print_compositor_set_print_line_numbers (GtkSourcePrintCompositor *co **/ void gtk_source_print_compositor_set_print_header (GtkSourcePrintCompositor *compositor, - gboolean print) + gboolean print) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); print = (print != FALSE); - if (print == compositor->priv->print_header) + if (print == priv->print_header) return; - compositor->priv->print_header = print; + priv->print_header = print; g_object_notify (G_OBJECT (compositor), "print-header"); } @@ -1061,9 +1079,11 @@ gtk_source_print_compositor_set_print_header (GtkSourcePrintCompositor *composit gboolean gtk_source_print_compositor_get_print_header (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), FALSE); - return compositor->priv->print_header; + return priv->print_header; } /** @@ -1086,17 +1106,19 @@ gtk_source_print_compositor_get_print_header (GtkSourcePrintCompositor *composit **/ void gtk_source_print_compositor_set_print_footer (GtkSourcePrintCompositor *compositor, - gboolean print) + gboolean print) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); print = (print != FALSE); - if (print == compositor->priv->print_footer) + if (print == priv->print_footer) return; - compositor->priv->print_footer = print; + priv->print_footer = print; g_object_notify (G_OBJECT (compositor), "print-footer"); } @@ -1117,9 +1139,11 @@ gtk_source_print_compositor_set_print_footer (GtkSourcePrintCompositor *composit gboolean gtk_source_print_compositor_get_print_footer (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), FALSE); - return compositor->priv->print_footer; + return priv->print_footer; } /** @@ -1156,24 +1180,26 @@ gtk_source_print_compositor_get_print_footer (GtkSourcePrintCompositor *composit **/ void gtk_source_print_compositor_set_header_format (GtkSourcePrintCompositor *compositor, - gboolean separator, - const gchar *left, - const gchar *center, - const gchar *right) + gboolean separator, + const gchar *left, + const gchar *center, + const gchar *right) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); /* FIXME: validate given strings? */ - g_free (compositor->priv->header_format_left); - g_free (compositor->priv->header_format_center); - g_free (compositor->priv->header_format_right); + g_free (priv->header_format_left); + g_free (priv->header_format_center); + g_free (priv->header_format_right); - compositor->priv->header_separator = separator; + priv->header_separator = separator; - compositor->priv->header_format_left = g_strdup (left); - compositor->priv->header_format_center = g_strdup (center); - compositor->priv->header_format_right = g_strdup (right); + priv->header_format_left = g_strdup (left); + priv->header_format_center = g_strdup (center); + priv->header_format_right = g_strdup (right); } /** @@ -1191,24 +1217,26 @@ gtk_source_print_compositor_set_header_format (GtkSourcePrintCompositor *composi **/ void gtk_source_print_compositor_set_footer_format (GtkSourcePrintCompositor *compositor, - gboolean separator, - const gchar *left, - const gchar *center, - const gchar *right) + gboolean separator, + const gchar *left, + const gchar *center, + const gchar *right) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); /* FIXME: validate given strings? */ - g_free (compositor->priv->footer_format_left); - g_free (compositor->priv->footer_format_center); - g_free (compositor->priv->footer_format_right); + g_free (priv->footer_format_left); + g_free (priv->footer_format_center); + g_free (priv->footer_format_right); - compositor->priv->footer_separator = separator; + priv->footer_separator = separator; - compositor->priv->footer_format_left = g_strdup (left); - compositor->priv->footer_format_center = g_strdup (center); - compositor->priv->footer_format_right = g_strdup (right); + priv->footer_format_left = g_strdup (left); + priv->footer_format_center = g_strdup (center); + priv->footer_format_right = g_strdup (right); } /** @@ -1226,24 +1254,27 @@ gtk_source_print_compositor_set_footer_format (GtkSourcePrintCompositor *composi guint gtk_source_print_compositor_get_print_line_numbers (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0); - return compositor->priv->print_line_numbers; + return priv->print_line_numbers; } static gboolean set_font_description_from_name (GtkSourcePrintCompositor *compositor, - PangoFontDescription **font, - const gchar *font_name) + PangoFontDescription **font, + const gchar *font_name) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); PangoFontDescription *new; if (font_name != NULL) new = pango_font_description_from_string (font_name); else { - g_return_val_if_fail (compositor->priv->body_font != NULL, FALSE); - new = pango_font_description_copy (compositor->priv->body_font); + g_return_val_if_fail (priv->body_font != NULL, FALSE); + new = pango_font_description_copy (priv->body_font); } if (*font == NULL || !pango_font_description_equal (*font, new)) @@ -1281,14 +1312,16 @@ set_font_description_from_name (GtkSourcePrintCompositor *compositor, */ void gtk_source_print_compositor_set_body_font_name (GtkSourcePrintCompositor *compositor, - const gchar *font_name) + const gchar *font_name) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); g_return_if_fail (font_name != NULL); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); if (set_font_description_from_name (compositor, - &compositor->priv->body_font, + &priv->body_font, font_name)) { g_object_notify (G_OBJECT (compositor), "body-font-name"); @@ -1310,9 +1343,11 @@ gtk_source_print_compositor_set_body_font_name (GtkSourcePrintCompositor *compos gchar * gtk_source_print_compositor_get_body_font_name (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL); - return pango_font_description_to_string (compositor->priv->body_font); + return pango_font_description_to_string (priv->body_font); } /** @@ -1336,14 +1371,16 @@ gtk_source_print_compositor_get_body_font_name (GtkSourcePrintCompositor *compos */ void gtk_source_print_compositor_set_line_numbers_font_name (GtkSourcePrintCompositor *compositor, - const gchar *font_name) + const gchar *font_name) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); g_return_if_fail (font_name != NULL); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); if (set_font_description_from_name (compositor, - &compositor->priv->line_numbers_font, + &priv->line_numbers_font, font_name)) { g_object_notify (G_OBJECT (compositor), "line-numbers-font-name"); @@ -1365,15 +1402,17 @@ gtk_source_print_compositor_set_line_numbers_font_name (GtkSourcePrintCompositor gchar * gtk_source_print_compositor_get_line_numbers_font_name (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL); - if (compositor->priv->line_numbers_font == NULL) + if (priv->line_numbers_font == NULL) { - g_return_val_if_fail (compositor->priv->body_font != NULL, NULL); - compositor->priv->line_numbers_font = pango_font_description_copy (compositor->priv->body_font); + g_return_val_if_fail (priv->body_font != NULL, NULL); + priv->line_numbers_font = pango_font_description_copy (priv->body_font); } - return pango_font_description_to_string (compositor->priv->line_numbers_font); + return pango_font_description_to_string (priv->line_numbers_font); } /** @@ -1397,14 +1436,16 @@ gtk_source_print_compositor_get_line_numbers_font_name (GtkSourcePrintCompositor */ void gtk_source_print_compositor_set_header_font_name (GtkSourcePrintCompositor *compositor, - const gchar *font_name) + const gchar *font_name) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); g_return_if_fail (font_name != NULL); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); if (set_font_description_from_name (compositor, - &compositor->priv->header_font, + &priv->header_font, font_name)) { @@ -1427,15 +1468,17 @@ gtk_source_print_compositor_set_header_font_name (GtkSourcePrintCompositor *comp gchar * gtk_source_print_compositor_get_header_font_name (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL); - if (compositor->priv->header_font == NULL) + if (priv->header_font == NULL) { - g_return_val_if_fail (compositor->priv->body_font != NULL, NULL); - compositor->priv->header_font = pango_font_description_copy (compositor->priv->body_font); + g_return_val_if_fail (priv->body_font != NULL, NULL); + priv->header_font = pango_font_description_copy (priv->body_font); } - return pango_font_description_to_string (compositor->priv->header_font); + return pango_font_description_to_string (priv->header_font); } /** @@ -1459,14 +1502,16 @@ gtk_source_print_compositor_get_header_font_name (GtkSourcePrintCompositor *comp */ void gtk_source_print_compositor_set_footer_font_name (GtkSourcePrintCompositor *compositor, - const gchar *font_name) + const gchar *font_name) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); g_return_if_fail (font_name != NULL); - g_return_if_fail (compositor->priv->state == INIT); + g_return_if_fail (priv->state == INIT); if (set_font_description_from_name (compositor, - &compositor->priv->footer_font, + &priv->footer_font, font_name)) { @@ -1489,15 +1534,17 @@ gtk_source_print_compositor_set_footer_font_name (GtkSourcePrintCompositor *comp gchar * gtk_source_print_compositor_get_footer_font_name (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL); - if (compositor->priv->footer_font == NULL) + if (priv->footer_font == NULL) { - g_return_val_if_fail (compositor->priv->body_font != NULL, NULL); - compositor->priv->footer_font = pango_font_description_copy (compositor->priv->body_font); + g_return_val_if_fail (priv->body_font != NULL, NULL); + priv->footer_font = pango_font_description_copy (priv->body_font); } - return pango_font_description_to_string (compositor->priv->footer_font); + return pango_font_description_to_string (priv->footer_font); } /** @@ -1512,12 +1559,14 @@ gtk_source_print_compositor_get_footer_font_name (GtkSourcePrintCompositor *comp */ void gtk_source_print_compositor_set_top_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit) + gdouble margin, + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - compositor->priv->margin_top = convert_to_mm (margin, unit); + priv->margin_top = convert_to_mm (margin, unit); } /** @@ -1533,11 +1582,13 @@ gtk_source_print_compositor_set_top_margin (GtkSourcePrintCompositor *compositor */ gdouble gtk_source_print_compositor_get_top_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit) + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0); - return convert_from_mm (compositor->priv->margin_top, unit); + return convert_from_mm (priv->margin_top, unit); } /** @@ -1552,12 +1603,14 @@ gtk_source_print_compositor_get_top_margin (GtkSourcePrintCompositor *compositor */ void gtk_source_print_compositor_set_bottom_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit) + gdouble margin, + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - compositor->priv->margin_bottom = convert_to_mm (margin, unit); + priv->margin_bottom = convert_to_mm (margin, unit); } /** @@ -1573,11 +1626,13 @@ gtk_source_print_compositor_set_bottom_margin (GtkSourcePrintCompositor *composi */ gdouble gtk_source_print_compositor_get_bottom_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit) + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0); - return convert_from_mm (compositor->priv->margin_bottom, unit); + return convert_from_mm (priv->margin_bottom, unit); } /** @@ -1592,12 +1647,14 @@ gtk_source_print_compositor_get_bottom_margin (GtkSourcePrintCompositor *composi */ void gtk_source_print_compositor_set_left_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit) + gdouble margin, + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - compositor->priv->margin_left = convert_to_mm (margin, unit); + priv->margin_left = convert_to_mm (margin, unit); } /** @@ -1613,11 +1670,13 @@ gtk_source_print_compositor_set_left_margin (GtkSourcePrintCompositor *composito */ gdouble gtk_source_print_compositor_get_left_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit) + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0); - return convert_from_mm (compositor->priv->margin_left, unit); + return convert_from_mm (priv->margin_left, unit); } /** @@ -1632,12 +1691,14 @@ gtk_source_print_compositor_get_left_margin (GtkSourcePrintCompositor *composito */ void gtk_source_print_compositor_set_right_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit) + gdouble margin, + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor)); - compositor->priv->margin_right = convert_to_mm (margin, unit); + priv->margin_right = convert_to_mm (margin, unit); } /** @@ -1653,11 +1714,13 @@ gtk_source_print_compositor_set_right_margin (GtkSourcePrintCompositor *composit */ gdouble gtk_source_print_compositor_get_right_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit) + GtkUnit unit) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0); - return convert_from_mm (compositor->priv->margin_right, unit); + return convert_from_mm (priv->margin_right, unit); } /** @@ -1673,14 +1736,16 @@ gtk_source_print_compositor_get_right_margin (GtkSourcePrintCompositor *composit * Since: 2.2 */ gint -gtk_source_print_compositor_get_n_pages (GtkSourcePrintCompositor *compositor) +gtk_source_print_compositor_get_n_pages (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), -1); - if (compositor->priv->state != DONE) + if (priv->state != DONE) return -1; - return compositor->priv->n_pages; + return priv->n_pages; } /* utility functions to deal with coordinates (returns) */ @@ -1688,12 +1753,13 @@ gtk_source_print_compositor_get_n_pages (GtkSourcePrintCompositor *compositor) static gdouble get_text_x (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gdouble x; - x = compositor->priv->real_margin_left; + x = priv->real_margin_left; - if (compositor->priv->print_line_numbers) - x += compositor->priv->line_numbers_width + NUMBERS_TEXT_SEPARATION; + if (priv->print_line_numbers) + x += priv->line_numbers_width + NUMBERS_TEXT_SEPARATION; return x; } @@ -1701,9 +1767,10 @@ get_text_x (GtkSourcePrintCompositor *compositor) static gdouble get_text_y (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gdouble y; - y = compositor->priv->real_margin_top + compositor->priv->header_height; + y = priv->real_margin_top + priv->header_height; return y; } @@ -1711,9 +1778,10 @@ get_text_y (GtkSourcePrintCompositor *compositor) static gdouble get_line_numbers_x (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gdouble x; - x = compositor->priv->real_margin_left; + x = priv->real_margin_left; return x; } @@ -1721,14 +1789,15 @@ get_line_numbers_x (GtkSourcePrintCompositor *compositor) static gdouble get_text_width (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gdouble w; - w = compositor->priv->paper_width - - compositor->priv->real_margin_left - - compositor->priv->real_margin_right; + w = priv->paper_width - + priv->real_margin_left - + priv->real_margin_right; - if (compositor->priv->print_line_numbers) - w -= (compositor->priv->line_numbers_width + NUMBERS_TEXT_SEPARATION); + if (priv->print_line_numbers) + w -= (priv->line_numbers_width + NUMBERS_TEXT_SEPARATION); if (w < convert_from_mm (50, GTK_UNIT_POINTS)) { g_warning ("Printable page width too little."); @@ -1741,13 +1810,14 @@ get_text_width (GtkSourcePrintCompositor *compositor) static gdouble get_text_height (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); double h; - h = compositor->priv->paper_height - - compositor->priv->real_margin_top - - compositor->priv->real_margin_bottom - - compositor->priv->header_height - - compositor->priv->footer_height; + h = priv->paper_height - + priv->real_margin_top - + priv->real_margin_bottom - + priv->header_height - + priv->footer_height; if (h < convert_from_mm (50, GTK_UNIT_POINTS)) { g_warning ("Printable page height too little."); @@ -1760,29 +1830,34 @@ get_text_height (GtkSourcePrintCompositor *compositor) static gboolean is_header_to_print (GtkSourcePrintCompositor *compositor) { - return (compositor->priv->print_header && - ((compositor->priv->header_format_left != NULL) || - (compositor->priv->header_format_center != NULL) || - (compositor->priv->header_format_right != NULL))); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + + return (priv->print_header && + ((priv->header_format_left != NULL) || + (priv->header_format_center != NULL) || + (priv->header_format_right != NULL))); } static gboolean is_footer_to_print (GtkSourcePrintCompositor *compositor) { - return (compositor->priv->print_footer && - ((compositor->priv->footer_format_left != NULL) || - (compositor->priv->footer_format_center != NULL) || - (compositor->priv->footer_format_right != NULL))); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + + return (priv->print_footer && + ((priv->footer_format_left != NULL) || + (priv->footer_format_center != NULL) || + (priv->footer_format_right != NULL))); } static void set_layout_tab_width (GtkSourcePrintCompositor *compositor, - PangoLayout *layout) + PangoLayout *layout) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gchar *str; gint tab_width = 0; - str = g_strnfill (compositor->priv->tab_width, ' '); + str = g_strnfill (priv->tab_width, ' '); pango_layout_set_text (layout, str, -1); g_free (str); @@ -1806,15 +1881,16 @@ set_layout_tab_width (GtkSourcePrintCompositor *compositor, static void setup_pango_layouts (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context) + GtkPrintContext *context) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); PangoLayout *layout; /* Layout for the text */ layout = gtk_print_context_create_pango_layout (context); - pango_layout_set_font_description (layout, compositor->priv->body_font); + pango_layout_set_font_description (layout, priv->body_font); - switch (compositor->priv->wrap_mode) + switch (priv->wrap_mode) { case GTK_WRAP_CHAR: pango_layout_set_wrap (layout, PANGO_WRAP_CHAR); @@ -1841,21 +1917,21 @@ setup_pango_layouts (GtkSourcePrintCompositor *compositor, set_layout_tab_width (compositor, layout); - g_return_if_fail (compositor->priv->layout == NULL); - compositor->priv->layout = layout; + g_return_if_fail (priv->layout == NULL); + priv->layout = layout; /* Layout for line numbers */ - if (compositor->priv->print_line_numbers > 0) + if (priv->print_line_numbers > 0) { layout = gtk_print_context_create_pango_layout (context); - if (compositor->priv->line_numbers_font == NULL) - compositor->priv->line_numbers_font = pango_font_description_copy_static (compositor->priv->body_font); - pango_layout_set_font_description (layout, compositor->priv->line_numbers_font); + if (priv->line_numbers_font == NULL) + priv->line_numbers_font = pango_font_description_copy_static (priv->body_font); + pango_layout_set_font_description (layout, priv->line_numbers_font); pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT); - g_return_if_fail (compositor->priv->line_numbers_layout == NULL); - compositor->priv->line_numbers_layout = layout; + g_return_if_fail (priv->line_numbers_layout == NULL); + priv->line_numbers_layout = layout; } /* Layout for header */ @@ -1863,13 +1939,13 @@ setup_pango_layouts (GtkSourcePrintCompositor *compositor, { layout = gtk_print_context_create_pango_layout (context); - if (compositor->priv->header_font == NULL) - compositor->priv->header_font = pango_font_description_copy_static (compositor->priv->body_font); + if (priv->header_font == NULL) + priv->header_font = pango_font_description_copy_static (priv->body_font); - pango_layout_set_font_description (layout, compositor->priv->header_font); + pango_layout_set_font_description (layout, priv->header_font); - g_return_if_fail (compositor->priv->header_layout == NULL); - compositor->priv->header_layout = layout; + g_return_if_fail (priv->header_layout == NULL); + priv->header_layout = layout; } /* Layout for footer */ @@ -1877,20 +1953,21 @@ setup_pango_layouts (GtkSourcePrintCompositor *compositor, { layout = gtk_print_context_create_pango_layout (context); - if (compositor->priv->footer_font == NULL) - compositor->priv->footer_font = pango_font_description_copy_static (compositor->priv->body_font); + if (priv->footer_font == NULL) + priv->footer_font = pango_font_description_copy_static (priv->body_font); - pango_layout_set_font_description (layout, compositor->priv->footer_font); + pango_layout_set_font_description (layout, priv->footer_font); - g_return_if_fail (compositor->priv->footer_layout == NULL); - compositor->priv->footer_layout = layout; + g_return_if_fail (priv->footer_layout == NULL); + priv->footer_layout = layout; } } static gchar * evaluate_format_string (GtkSourcePrintCompositor *compositor, - const gchar *format) + const gchar *format) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); GDateTime *now; GString *eval; gchar *eval_str, *retval; @@ -1908,9 +1985,9 @@ evaluate_format_string (GtkSourcePrintCompositor *compositor, format = g_utf8_next_char (format); ch = g_utf8_get_char (format); if (ch == 'N') - g_string_append_printf (eval, "%d", compositor->priv->current_page + 1); + g_string_append_printf (eval, "%d", priv->current_page + 1); else if (ch == 'Q') - g_string_append_printf (eval, "%d", compositor->priv->n_pages); + g_string_append_printf (eval, "%d", priv->n_pages); else { g_string_append_c (eval, '%'); @@ -1964,55 +2041,57 @@ get_n_digits (guint n) static void calculate_line_numbers_layout_size (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context) + GtkPrintContext *context) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gint line_count; gint n_digits; gchar *str; - if (compositor->priv->print_line_numbers == 0) + if (priv->print_line_numbers == 0) { - compositor->priv->line_numbers_width = 0.0; - compositor->priv->line_numbers_height = 0.0; + priv->line_numbers_width = 0.0; + priv->line_numbers_height = 0.0; DEBUG ({ g_debug ("line_numbers_width: %f points (%f mm)", - compositor->priv->line_numbers_width, - convert_to_mm (compositor->priv->line_numbers_width, GTK_UNIT_POINTS)); + priv->line_numbers_width, + convert_to_mm (priv->line_numbers_width, GTK_UNIT_POINTS)); g_debug ("line_numbers_height: %f points (%f mm)", - compositor->priv->line_numbers_height, - convert_to_mm (compositor->priv->line_numbers_height, GTK_UNIT_POINTS)); + priv->line_numbers_height, + convert_to_mm (priv->line_numbers_height, GTK_UNIT_POINTS)); }); return; } - line_count = gtk_text_buffer_get_line_count (GTK_TEXT_BUFFER (compositor->priv->buffer)); + line_count = gtk_text_buffer_get_line_count (GTK_TEXT_BUFFER (priv->buffer)); n_digits = get_n_digits (line_count); str = g_strnfill (n_digits, '9'); - pango_layout_set_text (compositor->priv->line_numbers_layout, str, -1); + pango_layout_set_text (priv->line_numbers_layout, str, -1); g_free (str); - get_layout_size (compositor->priv->line_numbers_layout, - &compositor->priv->line_numbers_width, - &compositor->priv->line_numbers_height); + get_layout_size (priv->line_numbers_layout, + &priv->line_numbers_width, + &priv->line_numbers_height); DEBUG ({ g_debug ("line_numbers_width: %f points (%f mm)", - compositor->priv->line_numbers_width, - convert_to_mm (compositor->priv->line_numbers_width, GTK_UNIT_POINTS)); + priv->line_numbers_width, + convert_to_mm (priv->line_numbers_width, GTK_UNIT_POINTS)); g_debug ("line_numbers_height: %f points (%f mm)", - compositor->priv->line_numbers_height, - convert_to_mm (compositor->priv->line_numbers_height, GTK_UNIT_POINTS)); + priv->line_numbers_height, + convert_to_mm (priv->line_numbers_height, GTK_UNIT_POINTS)); }); } static gdouble calculate_header_footer_height (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context, - PangoFontDescription *font, - gdouble *d) + GtkPrintContext *context, + PangoFontDescription *font, + gdouble *d) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); PangoContext *pango_context; PangoFontMetrics* font_metrics; gdouble ascent; @@ -2023,7 +2102,7 @@ calculate_header_footer_height (GtkSourcePrintCompositor *compositor, font_metrics = pango_context_get_metrics (pango_context, font, - compositor->priv->language); + priv->language); ascent = (gdouble) pango_font_metrics_get_ascent (font_metrics) / PANGO_SCALE; descent = (gdouble) pango_font_metrics_get_descent (font_metrics) / PANGO_SCALE; @@ -2039,123 +2118,128 @@ calculate_header_footer_height (GtkSourcePrintCompositor *compositor, static void calculate_header_height (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context) + GtkPrintContext *context) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + if (!is_header_to_print(compositor)) { - compositor->priv->header_height = 0.0; + priv->header_height = 0.0; DEBUG ({ g_debug ("header_height: %f points (%f mm)", - compositor->priv->header_height, - convert_to_mm (compositor->priv->header_height, GTK_UNIT_POINTS)); + priv->header_height, + convert_to_mm (priv->header_height, GTK_UNIT_POINTS)); }); return; } - g_return_if_fail (compositor->priv->header_font != NULL); + g_return_if_fail (priv->header_font != NULL); - compositor->priv->header_height = calculate_header_footer_height (compositor, + priv->header_height = calculate_header_footer_height (compositor, context, - compositor->priv->header_font, + priv->header_font, NULL); DEBUG ({ g_debug ("header_height: %f points (%f mm)", - compositor->priv->header_height, - convert_to_mm (compositor->priv->header_height, GTK_UNIT_POINTS)); + priv->header_height, + convert_to_mm (priv->header_height, GTK_UNIT_POINTS)); }); } static void calculate_footer_height (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context) + GtkPrintContext *context) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + if (!is_footer_to_print (compositor)) { - compositor->priv->footer_height = 0.0; + priv->footer_height = 0.0; DEBUG ({ g_debug ("footer_height: %f points (%f mm)", - compositor->priv->footer_height, - convert_to_mm (compositor->priv->footer_height, GTK_UNIT_POINTS)); + priv->footer_height, + convert_to_mm (priv->footer_height, GTK_UNIT_POINTS)); }); return; } - if (compositor->priv->footer_font == NULL) - compositor->priv->footer_font = pango_font_description_copy_static (compositor->priv->body_font); + if (priv->footer_font == NULL) + priv->footer_font = pango_font_description_copy_static (priv->body_font); - compositor->priv->footer_height = calculate_header_footer_height (compositor, + priv->footer_height = calculate_header_footer_height (compositor, context, - compositor->priv->footer_font, - &compositor->priv->footer_font_descent); + priv->footer_font, + &priv->footer_font_descent); DEBUG ({ g_debug ("footer_height: %f points (%f mm)", - compositor->priv->footer_height, - convert_to_mm (compositor->priv->footer_height, GTK_UNIT_POINTS)); + priv->footer_height, + convert_to_mm (priv->footer_height, GTK_UNIT_POINTS)); }); } static void calculate_page_size_and_margins (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context) + GtkPrintContext *context) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); GtkPageSetup *page_setup; /* calculate_line_numbers_layout_size and calculate_header_footer_height functions must be called before calculate_page_size_and_margins */ - g_return_if_fail (compositor->priv->line_numbers_width >= 0.0); - g_return_if_fail (compositor->priv->header_height >= 0.0); - g_return_if_fail (compositor->priv->footer_height >= 0.0); + g_return_if_fail (priv->line_numbers_width >= 0.0); + g_return_if_fail (priv->header_height >= 0.0); + g_return_if_fail (priv->footer_height >= 0.0); page_setup = gtk_print_context_get_page_setup (context); - compositor->priv->page_margin_top = gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_POINTS); - compositor->priv->page_margin_left = gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_POINTS); + priv->page_margin_top = gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_POINTS); + priv->page_margin_left = gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_POINTS); /* Calculate real margins: the margins specified in the GtkPageSetup object are the "print margins". they are used to determine the minimal size for the layout margins. */ - compositor->priv->real_margin_top = MAX (compositor->priv->page_margin_top, - convert_from_mm (compositor->priv->margin_top, GTK_UNIT_POINTS)); - compositor->priv->real_margin_bottom = MAX (gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_POINTS), - convert_from_mm (compositor->priv->margin_bottom, GTK_UNIT_POINTS)); - compositor->priv->real_margin_left = MAX (compositor->priv->page_margin_left, - convert_from_mm (compositor->priv->margin_left, GTK_UNIT_POINTS)); - compositor->priv->real_margin_right = MAX (gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_POINTS), - convert_from_mm (compositor->priv->margin_right, GTK_UNIT_POINTS)); + priv->real_margin_top = MAX (priv->page_margin_top, + convert_from_mm (priv->margin_top, GTK_UNIT_POINTS)); + priv->real_margin_bottom = MAX (gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_POINTS), + convert_from_mm (priv->margin_bottom, GTK_UNIT_POINTS)); + priv->real_margin_left = MAX (priv->page_margin_left, + convert_from_mm (priv->margin_left, GTK_UNIT_POINTS)); + priv->real_margin_right = MAX (gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_POINTS), + convert_from_mm (priv->margin_right, GTK_UNIT_POINTS)); DEBUG ({ g_debug ("real_margin_top: %f points (%f mm)", - compositor->priv->real_margin_top, - convert_to_mm (compositor->priv->real_margin_top, GTK_UNIT_POINTS)); + priv->real_margin_top, + convert_to_mm (priv->real_margin_top, GTK_UNIT_POINTS)); g_debug ("real_margin_bottom: %f points (%f mm)", - compositor->priv->real_margin_bottom, - convert_to_mm (compositor->priv->real_margin_bottom, GTK_UNIT_POINTS)); + priv->real_margin_bottom, + convert_to_mm (priv->real_margin_bottom, GTK_UNIT_POINTS)); g_debug ("real_margin_left: %f points (%f mm)", - compositor->priv->real_margin_left, - convert_to_mm (compositor->priv->real_margin_left, GTK_UNIT_POINTS)); + priv->real_margin_left, + convert_to_mm (priv->real_margin_left, GTK_UNIT_POINTS)); g_debug ("real_margin_righ: %f points (%f mm)", - compositor->priv->real_margin_right, - convert_to_mm (compositor->priv->real_margin_right, GTK_UNIT_POINTS)); + priv->real_margin_right, + convert_to_mm (priv->real_margin_right, GTK_UNIT_POINTS)); }); - compositor->priv->paper_width = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS); - compositor->priv->paper_height = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS); + priv->paper_width = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS); + priv->paper_height = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS); DEBUG ({ gdouble text_width; gdouble text_height; g_debug ("paper_width: %f points (%f mm)", - compositor->priv->paper_width, - convert_to_mm (compositor->priv->paper_width, GTK_UNIT_POINTS)); + priv->paper_width, + convert_to_mm (priv->paper_width, GTK_UNIT_POINTS)); g_debug ("paper_heigth: %f points (%f mm)", - compositor->priv->paper_height, - convert_to_mm (compositor->priv->paper_height, GTK_UNIT_POINTS)); + priv->paper_height, + convert_to_mm (priv->paper_height, GTK_UNIT_POINTS)); text_width = get_text_width (compositor); text_height = get_text_height (compositor); g_debug ("text_width: %f points (%f mm)", text_width, convert_to_mm (text_width, GTK_UNIT_POINTS)); @@ -2172,9 +2256,10 @@ static gboolean ignore_tag (GtkSourcePrintCompositor *compositor, GtkTextTag *tag) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); GtkTextTag *bm_tag; - bm_tag = _gtk_source_buffer_get_bracket_match_tag (compositor->priv->buffer); + bm_tag = _gtk_source_buffer_get_bracket_match_tag (priv->buffer); if ((bm_tag != NULL) && (tag == bm_tag)) return TRUE; @@ -2183,8 +2268,8 @@ ignore_tag (GtkSourcePrintCompositor *compositor, static GSList * get_iter_attrs (GtkSourcePrintCompositor *compositor, - GtkTextIter *iter, - GtkTextIter *limit) + GtkTextIter *iter, + GtkTextIter *limit) { GSList *attrs = NULL; GSList *tags; @@ -2319,9 +2404,10 @@ is_empty_line (const gchar *text) static void layout_paragraph (GtkSourcePrintCompositor *compositor, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gchar *text; text = gtk_text_iter_get_slice (start, end); @@ -2333,22 +2419,22 @@ layout_paragraph (GtkSourcePrintCompositor *compositor, if (gtk_text_iter_ends_line (start) || is_empty_line (text)) { - pango_layout_set_text (compositor->priv->layout, " ", 1); + pango_layout_set_text (priv->layout, " ", 1); g_free (text); return; } - pango_layout_set_text (compositor->priv->layout, text, -1); + pango_layout_set_text (priv->layout, text, -1); g_free (text); - if (compositor->priv->highlight_syntax) + if (priv->highlight_syntax) { PangoAttrList *attr_list = NULL; GtkTextIter segm_start, segm_end; int start_index; /* Make sure it is highlighted even if it was not shown yet */ - gtk_source_buffer_ensure_highlight (compositor->priv->buffer, + gtk_source_buffer_ensure_highlight (priv->buffer, start, end); @@ -2386,7 +2472,7 @@ layout_paragraph (GtkSourcePrintCompositor *compositor, segm_start = segm_end; } - pango_layout_set_attributes (compositor->priv->layout, + pango_layout_set_attributes (priv->layout, attr_list); if (attr_list) @@ -2396,24 +2482,28 @@ layout_paragraph (GtkSourcePrintCompositor *compositor, static gboolean line_is_numbered (GtkSourcePrintCompositor *compositor, - gint line_number) + gint line_number) { - return (compositor->priv->print_line_numbers > 0) && - ((line_number + 1) % compositor->priv->print_line_numbers == 0); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + + return (priv->print_line_numbers > 0) && + ((line_number + 1) % priv->print_line_numbers == 0); } static void set_pango_layouts_width (GtkSourcePrintCompositor *compositor) { - g_return_if_fail (compositor->priv->layout != NULL); - pango_layout_set_width (compositor->priv->layout, + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + + g_return_if_fail (priv->layout != NULL); + pango_layout_set_width (priv->layout, get_text_width (compositor) * PANGO_SCALE); - if (compositor->priv->print_line_numbers) + if (priv->print_line_numbers) { - g_return_if_fail (compositor->priv->line_numbers_layout != NULL); - pango_layout_set_width (compositor->priv->line_numbers_layout, - compositor->priv->line_numbers_width * PANGO_SCALE); + g_return_if_fail (priv->line_numbers_layout != NULL); + pango_layout_set_width (priv->line_numbers_layout, + priv->line_numbers_width * PANGO_SCALE); } } @@ -2494,8 +2584,9 @@ set_pango_layouts_width (GtkSourcePrintCompositor *compositor) */ gboolean gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context) + GtkPrintContext *context) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); GtkTextIter start, end; gint page_start_offset; double text_height; @@ -2507,10 +2598,10 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), TRUE); g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), TRUE); - if (compositor->priv->state == DONE) + if (priv->state == DONE) return TRUE; - if (compositor->priv->state == INIT) + if (priv->state == INIT) { PROFILE ({ if (pagination_timer != NULL) @@ -2519,9 +2610,9 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, pagination_timer = g_timer_new (); }); - g_return_val_if_fail (compositor->priv->pages == NULL, TRUE); + g_return_val_if_fail (priv->pages == NULL, TRUE); - compositor->priv->pages = g_array_new (FALSE, FALSE, sizeof (gint)); + priv->pages = g_array_new (FALSE, FALSE, sizeof (gint)); setup_pango_layouts (compositor, context); @@ -2534,37 +2625,37 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, /* Cannot be done when setting up layouts since we need the width */ set_pango_layouts_width (compositor); - compositor->priv->state = PAGINATING; + priv->state = PAGINATING; } - g_return_val_if_fail (compositor->priv->state == PAGINATING, FALSE); - g_return_val_if_fail (compositor->priv->layout != NULL, FALSE); + g_return_val_if_fail (priv->state == PAGINATING, FALSE); + g_return_val_if_fail (priv->layout != NULL, FALSE); - if (compositor->priv->pagination_mark == NULL) + if (priv->pagination_mark == NULL) { - gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (compositor->priv->buffer), &start); + gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (priv->buffer), &start); - compositor->priv->pagination_mark = gtk_text_buffer_create_mark (GTK_TEXT_BUFFER (compositor->priv->buffer), + priv->pagination_mark = gtk_text_buffer_create_mark (GTK_TEXT_BUFFER (priv->buffer), NULL, &start, TRUE); /* add the first page start */ page_start_offset = gtk_text_iter_get_offset (&start); - g_array_append_val (compositor->priv->pages, page_start_offset); + g_array_append_val (priv->pages, page_start_offset); } else { - gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (compositor->priv->buffer), + gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->buffer), &start, - compositor->priv->pagination_mark); + priv->pagination_mark); } DEBUG ({ g_debug ("Start paginating at %d", gtk_text_iter_get_offset (&start)); }); - gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (compositor->priv->buffer), &end); + gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (priv->buffer), &end); cur_height = 0; text_height = get_text_height (compositor); @@ -2586,14 +2677,14 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, layout_paragraph (compositor, &start, &line_end); - get_layout_size (compositor->priv->layout, NULL, &line_height); + get_layout_size (priv->layout, NULL, &line_height); if (line_is_numbered (compositor, line_number)) { - g_assert (compositor->priv->line_numbers_height > 0); + g_assert (priv->line_numbers_height > 0); line_height = MAX (line_height, - compositor->priv->line_numbers_height); + priv->line_numbers_height); } #define EPS (.1) @@ -2601,8 +2692,8 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, { /* if we have multiline paragraphs, see how much of * it we can fit in the current page */ - if (compositor->priv->wrap_mode != GTK_WRAP_NONE && - pango_layout_get_line_count (compositor->priv->layout) > 1) + if (priv->wrap_mode != GTK_WRAP_NONE && + pango_layout_get_line_count (priv->layout) > 1) { PangoLayoutIter *layout_iter; PangoRectangle logical_rect; @@ -2610,7 +2701,7 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, double part_height = 0; gint idx; - layout_iter = pango_layout_get_iter (compositor->priv->layout); + layout_iter = pango_layout_get_iter (priv->layout); do { @@ -2622,7 +2713,7 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, if (is_first_line && line_is_numbered (compositor, line_number)) { - layout_line_height = MAX (compositor->priv->line_numbers_height, + layout_line_height = MAX (priv->line_numbers_height, layout_line_height); } @@ -2648,8 +2739,8 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, page_start_offset = gtk_text_iter_get_offset (&start); - gtk_text_buffer_move_mark (GTK_TEXT_BUFFER (compositor->priv->buffer), - compositor->priv->pagination_mark, + gtk_text_buffer_move_mark (GTK_TEXT_BUFFER (priv->buffer), + priv->pagination_mark, &start); /* if the remainder fits on the next page, go @@ -2670,8 +2761,8 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, { page_start_offset = gtk_text_iter_get_offset (&start); - gtk_text_buffer_move_mark (GTK_TEXT_BUFFER (compositor->priv->buffer), - compositor->priv->pagination_mark, + gtk_text_buffer_move_mark (GTK_TEXT_BUFFER (priv->buffer), + priv->pagination_mark, &start); /* reset cur_height for the next page */ @@ -2680,7 +2771,7 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, } /* store the start of the new page */ - g_array_append_val (compositor->priv->pages, + g_array_append_val (priv->pages, page_start_offset); ++pages_count; @@ -2707,26 +2798,26 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, DEBUG ({ int i; - for (i = 0; i < compositor->priv->pages->len; i += 1) + for (i = 0; i < priv->pages->len; i += 1) { gint offset; GtkTextIter iter; - offset = g_array_index (compositor->priv->pages, int, i); - gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (compositor->priv->buffer), &iter, offset); + offset = g_array_index (priv->pages, int, i); + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (priv->buffer), &iter, offset); g_debug (" page %d starts at line %d (offset %d)\n", i, gtk_text_iter_get_line (&iter), offset); } }); - compositor->priv->state = DONE; + priv->state = DONE; - compositor->priv->n_pages = compositor->priv->pages->len; + priv->n_pages = priv->pages->len; /* Remove the pagination mark */ - gtk_text_buffer_delete_mark (GTK_TEXT_BUFFER (compositor->priv->buffer), - compositor->priv->pagination_mark); - compositor->priv->pagination_mark = NULL; + gtk_text_buffer_delete_mark (GTK_TEXT_BUFFER (priv->buffer), + priv->pagination_mark); + priv->pagination_mark = NULL; } return (done != FALSE); @@ -2745,36 +2836,38 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, gdouble gtk_source_print_compositor_get_pagination_progress (GtkSourcePrintCompositor *compositor) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); GtkTextIter current; gint char_count; g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0.0); - if (compositor->priv->state == INIT) + if (priv->state == INIT) return 0.0; - if (compositor->priv->state == DONE) + if (priv->state == DONE) return 1.0; - char_count = gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (compositor->priv->buffer)); + char_count = gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (priv->buffer)); if (char_count == 0) return 1.0; - g_return_val_if_fail (compositor->priv->pagination_mark != NULL, 0.0); + g_return_val_if_fail (priv->pagination_mark != NULL, 0.0); - gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (compositor->priv->buffer), + gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->buffer), ¤t, - compositor->priv->pagination_mark); + priv->pagination_mark); return (gdouble) gtk_text_iter_get_offset (¤t) / (gdouble) char_count; } static void print_header_string (GtkSourcePrintCompositor *compositor, - cairo_t *cr, - PangoAlignment alignment, - const gchar *format) + cairo_t *cr, + PangoAlignment alignment, + const gchar *format) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gchar *text; text = evaluate_format_string (compositor, format); @@ -2789,31 +2882,31 @@ print_header_string (GtkSourcePrintCompositor *compositor, gdouble header_width; gdouble x; - header_width = compositor->priv->paper_width - - compositor->priv->real_margin_left - - compositor->priv->real_margin_right; + header_width = priv->paper_width - + priv->real_margin_left - + priv->real_margin_right; - pango_layout_set_text (compositor->priv->header_layout, text, -1); + pango_layout_set_text (priv->header_layout, text, -1); /* Print only the first line */ - iter = pango_layout_get_iter (compositor->priv->header_layout); + iter = pango_layout_get_iter (priv->header_layout); baseline = (gdouble) pango_layout_iter_get_baseline (iter) / (gdouble) PANGO_SCALE; - get_layout_size (compositor->priv->header_layout, &layout_width, &layout_height); + get_layout_size (priv->header_layout, &layout_width, &layout_height); switch (alignment) { case PANGO_ALIGN_RIGHT: - x = compositor->priv->real_margin_left + header_width - layout_width; + x = priv->real_margin_left + header_width - layout_width; break; case PANGO_ALIGN_CENTER: - x = compositor->priv->real_margin_left + header_width / 2 - layout_width / 2; + x = priv->real_margin_left + header_width / 2 - layout_width / 2; break; case PANGO_ALIGN_LEFT: default: - x = compositor->priv->real_margin_left; + x = priv->real_margin_left; break; } @@ -2824,7 +2917,7 @@ print_header_string (GtkSourcePrintCompositor *compositor, cairo_set_source_rgb (cr, 0., 0., 1.); cairo_rectangle (cr, x, - compositor->priv->real_margin_top, + priv->real_margin_top, layout_width, layout_height); cairo_stroke (cr); @@ -2836,7 +2929,7 @@ print_header_string (GtkSourcePrintCompositor *compositor, cairo_move_to (cr, x, - compositor->priv->real_margin_top + baseline); + priv->real_margin_top + baseline); pango_cairo_show_layout_line (cr, line); @@ -2847,42 +2940,44 @@ print_header_string (GtkSourcePrintCompositor *compositor, static void print_header (GtkSourcePrintCompositor *compositor, - cairo_t *cr) + cairo_t *cr) { - pango_cairo_update_layout (cr, compositor->priv->header_layout); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + + pango_cairo_update_layout (cr, priv->header_layout); /* left format */ - if (compositor->priv->header_format_left != NULL) + if (priv->header_format_left != NULL) print_header_string (compositor, cr, PANGO_ALIGN_LEFT, - compositor->priv->header_format_left); + priv->header_format_left); /* right format */ - if (compositor->priv->header_format_right != NULL) + if (priv->header_format_right != NULL) print_header_string (compositor, cr, PANGO_ALIGN_RIGHT, - compositor->priv->header_format_right); + priv->header_format_right); /* center format */ - if (compositor->priv->header_format_center != NULL) + if (priv->header_format_center != NULL) print_header_string (compositor, cr, PANGO_ALIGN_CENTER, - compositor->priv->header_format_center); + priv->header_format_center); /* separator */ - if (compositor->priv->header_separator) + if (priv->header_separator) { - gdouble y = compositor->priv->real_margin_top + - (1 - SEPARATOR_SPACING_FACTOR) * compositor->priv->header_height; + gdouble y = priv->real_margin_top + + (1 - SEPARATOR_SPACING_FACTOR) * priv->header_height; cairo_save (cr); - cairo_move_to (cr, compositor->priv->real_margin_left, y); + cairo_move_to (cr, priv->real_margin_left, y); cairo_set_line_width (cr, SEPARATOR_LINE_WIDTH); - cairo_line_to (cr, compositor->priv->paper_width - compositor->priv->real_margin_right, y); + cairo_line_to (cr, priv->paper_width - priv->real_margin_right, y); cairo_stroke (cr); cairo_restore (cr); @@ -2891,10 +2986,11 @@ print_header (GtkSourcePrintCompositor *compositor, static void print_footer_string (GtkSourcePrintCompositor *compositor, - cairo_t *cr, - PangoAlignment alignment, - const gchar *format) + cairo_t *cr, + PangoAlignment alignment, + const gchar *format) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); gchar *text; text = evaluate_format_string (compositor, format); @@ -2907,44 +3003,44 @@ print_footer_string (GtkSourcePrintCompositor *compositor, gdouble footer_width; gdouble x; - footer_width = compositor->priv->paper_width - - compositor->priv->real_margin_left - - compositor->priv->real_margin_right; + footer_width = priv->paper_width - + priv->real_margin_left - + priv->real_margin_right; - pango_layout_set_text (compositor->priv->footer_layout, text, -1); + pango_layout_set_text (priv->footer_layout, text, -1); - get_layout_size (compositor->priv->footer_layout, &layout_width, &layout_height); + get_layout_size (priv->footer_layout, &layout_width, &layout_height); switch (alignment) { case PANGO_ALIGN_RIGHT: - x = compositor->priv->real_margin_left + footer_width - layout_width; + x = priv->real_margin_left + footer_width - layout_width; break; case PANGO_ALIGN_CENTER: - x = compositor->priv->real_margin_left + footer_width / 2 - layout_width / 2; + x = priv->real_margin_left + footer_width / 2 - layout_width / 2; break; case PANGO_ALIGN_LEFT: default: - x = compositor->priv->real_margin_left; + x = priv->real_margin_left; break; } /* Print only the first line */ - line = pango_layout_get_line (compositor->priv->footer_layout, 0); + line = pango_layout_get_line (priv->footer_layout, 0); DEBUG ({ gdouble w; gdouble h; - get_layout_size (compositor->priv->footer_layout, &w, &h); + get_layout_size (priv->footer_layout, &w, &h); cairo_save (cr); cairo_set_line_width (cr, 1.); cairo_set_source_rgb (cr, 0., 0., 1.); cairo_rectangle (cr, x, - compositor->priv->paper_height - compositor->priv->real_margin_bottom - h, + priv->paper_height - priv->real_margin_bottom - h, layout_width, layout_height); cairo_stroke (cr); @@ -2953,8 +3049,8 @@ print_footer_string (GtkSourcePrintCompositor *compositor, cairo_move_to (cr, x, - compositor->priv->paper_height - - compositor->priv->real_margin_bottom - compositor->priv->footer_font_descent); + priv->paper_height - + priv->real_margin_bottom - priv->footer_font_descent); pango_cairo_show_layout_line (cr, line); @@ -2964,43 +3060,45 @@ print_footer_string (GtkSourcePrintCompositor *compositor, static void print_footer (GtkSourcePrintCompositor *compositor, - cairo_t *cr) + cairo_t *cr) { - pango_cairo_update_layout (cr, compositor->priv->footer_layout); + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); + + pango_cairo_update_layout (cr, priv->footer_layout); /* left format */ - if (compositor->priv->footer_format_left != NULL) + if (priv->footer_format_left != NULL) print_footer_string (compositor, cr, PANGO_ALIGN_LEFT, - compositor->priv->footer_format_left); + priv->footer_format_left); /* right format */ - if (compositor->priv->footer_format_right != NULL) + if (priv->footer_format_right != NULL) print_footer_string (compositor, cr, PANGO_ALIGN_RIGHT, - compositor->priv->footer_format_right); + priv->footer_format_right); /* center format */ - if (compositor->priv->footer_format_center != NULL) + if (priv->footer_format_center != NULL) print_footer_string (compositor, cr, PANGO_ALIGN_CENTER, - compositor->priv->footer_format_center); + priv->footer_format_center); /* separator */ - if (compositor->priv->footer_separator) + if (priv->footer_separator) { - gdouble y = compositor->priv->paper_height - - compositor->priv->real_margin_bottom - - (1 - SEPARATOR_SPACING_FACTOR) * compositor->priv->footer_height; + gdouble y = priv->paper_height - + priv->real_margin_bottom - + (1 - SEPARATOR_SPACING_FACTOR) * priv->footer_height; cairo_save (cr); - cairo_move_to (cr, compositor->priv->real_margin_left, y); + cairo_move_to (cr, priv->real_margin_left, y); cairo_set_line_width (cr, SEPARATOR_LINE_WIDTH); - cairo_line_to (cr, compositor->priv->paper_width - compositor->priv->real_margin_right, y); + cairo_line_to (cr, priv->paper_width - priv->real_margin_right, y); cairo_stroke (cr); cairo_restore (cr); @@ -3040,9 +3138,10 @@ print_footer (GtkSourcePrintCompositor *compositor, */ void gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context, - gint page_nr) + GtkPrintContext *context, + gint page_nr) { + GtkSourcePrintCompositorPrivate *priv = gtk_source_print_compositor_get_instance_private (compositor); cairo_t *cr; GtkTextIter start, end; gint offset; @@ -3052,13 +3151,13 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, g_return_if_fail (GTK_IS_PRINT_CONTEXT (context)); g_return_if_fail (page_nr >= 0); - compositor->priv->current_page = page_nr; + priv->current_page = page_nr; cr = gtk_print_context_get_cairo_context (context); cairo_set_source_rgb (cr, 0, 0, 0); cairo_translate (cr, - -1 * compositor->priv->page_margin_left, - -1 * compositor->priv->page_margin_top); + -1 * priv->page_margin_left, + -1 * priv->page_margin_top); if (is_header_to_print (compositor)) { @@ -3080,18 +3179,18 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, cairo_set_line_width (cr, 1.); cairo_set_source_rgb (cr, 0., 0., 1.); cairo_rectangle (cr, - compositor->priv->real_margin_left, - compositor->priv->real_margin_top, - compositor->priv->paper_width - - compositor->priv->real_margin_left - compositor->priv->real_margin_right, - compositor->priv->paper_height - - compositor->priv->real_margin_top - compositor->priv->real_margin_bottom); + priv->real_margin_left, + priv->real_margin_top, + priv->paper_width - + priv->real_margin_left - priv->real_margin_right, + priv->paper_height - + priv->real_margin_top - priv->real_margin_bottom); cairo_stroke (cr); cairo_set_source_rgb (cr, 1., 0., 0.); cairo_rectangle (cr, ln_x, y, - compositor->priv->line_numbers_width, + priv->line_numbers_width, get_text_height (compositor)); cairo_stroke (cr); @@ -3105,39 +3204,39 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, cairo_set_source_rgb (cr, 1., 0., 0.); cairo_rectangle (cr, 0, 0, - compositor->priv->paper_width, - compositor->priv->paper_height); + priv->paper_width, + priv->paper_height); cairo_stroke (cr); cairo_restore (cr); }); - g_return_if_fail (compositor->priv->layout != NULL); - pango_cairo_update_layout (cr, compositor->priv->layout); + g_return_if_fail (priv->layout != NULL); + pango_cairo_update_layout (cr, priv->layout); - if (compositor->priv->print_line_numbers) + if (priv->print_line_numbers) { - g_return_if_fail (compositor->priv->line_numbers_layout != NULL); - pango_cairo_update_layout (cr, compositor->priv->line_numbers_layout); + g_return_if_fail (priv->line_numbers_layout != NULL); + pango_cairo_update_layout (cr, priv->line_numbers_layout); } - g_return_if_fail (compositor->priv->buffer != NULL); - g_return_if_fail (compositor->priv->pages != NULL); - g_return_if_fail ((guint) page_nr < compositor->priv->pages->len); + g_return_if_fail (priv->buffer != NULL); + g_return_if_fail (priv->pages != NULL); + g_return_if_fail ((guint) page_nr < priv->pages->len); - offset = g_array_index (compositor->priv->pages, int, page_nr); - gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (compositor->priv->buffer), + offset = g_array_index (priv->pages, int, page_nr); + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (priv->buffer), &start, offset); - if ((guint) page_nr + 1 < compositor->priv->pages->len) + if ((guint) page_nr + 1 < priv->pages->len) { - offset = g_array_index (compositor->priv->pages, int, page_nr + 1); - gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (compositor->priv->buffer), + offset = g_array_index (priv->pages, int, page_nr + 1); + gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (priv->buffer), &end, offset); } else { - gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (compositor->priv->buffer), + gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (priv->buffer), &end); } @@ -3169,7 +3268,7 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, layout_paragraph (compositor, &start, &line_end); - get_layout_size (compositor->priv->layout, NULL, &line_height); + get_layout_size (priv->layout, NULL, &line_height); baseline_offset = 0; @@ -3183,15 +3282,15 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, gchar *str; str = g_strdup_printf ("%d", line_number + 1); - pango_layout_set_text (compositor->priv->line_numbers_layout, str, -1); + pango_layout_set_text (priv->line_numbers_layout, str, -1); g_free (str); /* Adjust the baseline */ - iter = pango_layout_get_iter (compositor->priv->layout); + iter = pango_layout_get_iter (priv->layout); baseline = (double) pango_layout_iter_get_baseline (iter) / (double) PANGO_SCALE; pango_layout_iter_free (iter); - iter = pango_layout_get_iter (compositor->priv->line_numbers_layout); + iter = pango_layout_get_iter (priv->line_numbers_layout); ln_baseline = (double) pango_layout_iter_get_baseline (iter) / (double) PANGO_SCALE; pango_layout_iter_free (iter); @@ -3205,18 +3304,17 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, cairo_move_to (cr, ln_x, y + ln_baseline_offset); - g_return_if_fail (compositor->priv->line_numbers_layout != NULL); - pango_cairo_show_layout (cr, compositor->priv->line_numbers_layout); + g_return_if_fail (priv->line_numbers_layout != NULL); + pango_cairo_show_layout (cr, priv->line_numbers_layout); } cairo_move_to (cr, x, y + baseline_offset); - pango_cairo_show_layout (cr, compositor->priv->layout); + pango_cairo_show_layout (cr, priv->layout); line_height = MAX (line_height, - compositor->priv->line_numbers_height); + priv->line_numbers_height); y += line_height; gtk_text_iter_forward_line (&start); } } - diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h index f42074e9..ee6abca1 100644 --- a/gtksourceview/gtksourceprintcompositor.h +++ b/gtksourceview/gtksourceprintcompositor.h @@ -30,191 +30,125 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_PRINT_COMPOSITOR (gtk_source_print_compositor_get_type ()) -#define GTK_SOURCE_PRINT_COMPOSITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositor)) -#define GTK_SOURCE_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass)) -#define GTK_SOURCE_IS_PRINT_COMPOSITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR)) -#define GTK_SOURCE_IS_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_PRINT_COMPOSITOR)) -#define GTK_SOURCE_PRINT_COMPOSITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass)) +#define GTK_SOURCE_TYPE_PRINT_COMPOSITOR (gtk_source_print_compositor_get_type()) -typedef struct _GtkSourcePrintCompositorClass GtkSourcePrintCompositorClass; -typedef struct _GtkSourcePrintCompositorPrivate GtkSourcePrintCompositorPrivate; - -struct _GtkSourcePrintCompositor -{ - GObject parent_instance; - - GtkSourcePrintCompositorPrivate *priv; -}; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourcePrintCompositor, gtk_source_print_compositor, GTK_SOURCE, PRINT_COMPOSITOR, GObject) struct _GtkSourcePrintCompositorClass { GObjectClass parent_class; - /* Padding for future expansion */ - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_print_compositor_get_type (void) G_GNUC_CONST; - - +GtkSourcePrintCompositor *gtk_source_print_compositor_new (GtkSourceBuffer *buffer); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourcePrintCompositor *gtk_source_print_compositor_new (GtkSourceBuffer *buffer); - +GtkSourcePrintCompositor *gtk_source_print_compositor_new_from_view (GtkSourceView *view); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourcePrintCompositor *gtk_source_print_compositor_new_from_view (GtkSourceView *view); - - +GtkSourceBuffer *gtk_source_print_compositor_get_buffer (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceBuffer *gtk_source_print_compositor_get_buffer (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_tab_width (GtkSourcePrintCompositor *compositor, + guint width); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_tab_width (GtkSourcePrintCompositor *compositor, - guint width); - +guint gtk_source_print_compositor_get_tab_width (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -guint gtk_source_print_compositor_get_tab_width (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_wrap_mode (GtkSourcePrintCompositor *compositor, + GtkWrapMode wrap_mode); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_wrap_mode (GtkSourcePrintCompositor *compositor, - GtkWrapMode wrap_mode); - +GtkWrapMode gtk_source_print_compositor_get_wrap_mode (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -GtkWrapMode gtk_source_print_compositor_get_wrap_mode (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_highlight_syntax (GtkSourcePrintCompositor *compositor, + gboolean highlight); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_highlight_syntax - (GtkSourcePrintCompositor *compositor, - gboolean highlight); - +gboolean gtk_source_print_compositor_get_highlight_syntax (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_print_compositor_get_highlight_syntax - (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_print_line_numbers (GtkSourcePrintCompositor *compositor, + guint interval); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_print_line_numbers - (GtkSourcePrintCompositor *compositor, - guint interval); - +guint gtk_source_print_compositor_get_print_line_numbers (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -guint gtk_source_print_compositor_get_print_line_numbers - (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_body_font_name (GtkSourcePrintCompositor *compositor, + const gchar *font_name); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_body_font_name - (GtkSourcePrintCompositor *compositor, - const gchar *font_name); - +gchar *gtk_source_print_compositor_get_body_font_name (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -gchar *gtk_source_print_compositor_get_body_font_name - (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_line_numbers_font_name (GtkSourcePrintCompositor *compositor, + const gchar *font_name); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_line_numbers_font_name - (GtkSourcePrintCompositor *compositor, - const gchar *font_name); - +gchar *gtk_source_print_compositor_get_line_numbers_font_name (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -gchar *gtk_source_print_compositor_get_line_numbers_font_name - (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_header_font_name (GtkSourcePrintCompositor *compositor, + const gchar *font_name); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_header_font_name - (GtkSourcePrintCompositor *compositor, - const gchar *font_name); - +gchar *gtk_source_print_compositor_get_header_font_name (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -gchar *gtk_source_print_compositor_get_header_font_name - (GtkSourcePrintCompositor *compositor); - +void gtk_source_print_compositor_set_footer_font_name (GtkSourcePrintCompositor *compositor, + const gchar *font_name); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_footer_font_name - (GtkSourcePrintCompositor *compositor, - const gchar *font_name); - +gchar *gtk_source_print_compositor_get_footer_font_name (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -gchar *gtk_source_print_compositor_get_footer_font_name - (GtkSourcePrintCompositor *compositor); - +gdouble gtk_source_print_compositor_get_top_margin (GtkSourcePrintCompositor *compositor, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -gdouble gtk_source_print_compositor_get_top_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit); - +void gtk_source_print_compositor_set_top_margin (GtkSourcePrintCompositor *compositor, + gdouble margin, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_top_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit); - +gdouble gtk_source_print_compositor_get_bottom_margin (GtkSourcePrintCompositor *compositor, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -gdouble gtk_source_print_compositor_get_bottom_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit); - +void gtk_source_print_compositor_set_bottom_margin (GtkSourcePrintCompositor *compositor, + gdouble margin, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_bottom_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit); - +gdouble gtk_source_print_compositor_get_left_margin (GtkSourcePrintCompositor *compositor, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -gdouble gtk_source_print_compositor_get_left_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit); - -GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_left_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit); - +void gtk_source_print_compositor_set_left_margin (GtkSourcePrintCompositor *compositor, + gdouble margin, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -gdouble gtk_source_print_compositor_get_right_margin (GtkSourcePrintCompositor *compositor, - GtkUnit unit); - +gdouble gtk_source_print_compositor_get_right_margin (GtkSourcePrintCompositor *compositor, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_right_margin (GtkSourcePrintCompositor *compositor, - gdouble margin, - GtkUnit unit); - +void gtk_source_print_compositor_set_right_margin (GtkSourcePrintCompositor *compositor, + gdouble margin, + GtkUnit unit); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_print_header (GtkSourcePrintCompositor *compositor, - gboolean print); - +void gtk_source_print_compositor_set_print_header (GtkSourcePrintCompositor *compositor, + gboolean print); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_print_compositor_get_print_header (GtkSourcePrintCompositor *compositor); - +gboolean gtk_source_print_compositor_get_print_header (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_print_footer (GtkSourcePrintCompositor *compositor, - gboolean print); - +void gtk_source_print_compositor_set_print_footer (GtkSourcePrintCompositor *compositor, + gboolean print); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_print_compositor_get_print_footer (GtkSourcePrintCompositor *compositor); - +gboolean gtk_source_print_compositor_get_print_footer (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_header_format (GtkSourcePrintCompositor *compositor, - gboolean separator, - const gchar *left, - const gchar *center, - const gchar *right); - +void gtk_source_print_compositor_set_header_format (GtkSourcePrintCompositor *compositor, + gboolean separator, + const gchar *left, + const gchar *center, + const gchar *right); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_set_footer_format (GtkSourcePrintCompositor *compositor, - gboolean separator, - const gchar *left, - const gchar *center, - const gchar *right); - +void gtk_source_print_compositor_set_footer_format (GtkSourcePrintCompositor *compositor, + gboolean separator, + const gchar *left, + const gchar *center, + const gchar *right); GTK_SOURCE_AVAILABLE_IN_ALL -gint gtk_source_print_compositor_get_n_pages (GtkSourcePrintCompositor *compositor); - +gint gtk_source_print_compositor_get_n_pages (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context); - +gboolean gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor, + GtkPrintContext *context); GTK_SOURCE_AVAILABLE_IN_ALL -gdouble gtk_source_print_compositor_get_pagination_progress - (GtkSourcePrintCompositor *compositor); - +gdouble gtk_source_print_compositor_get_pagination_progress (GtkSourcePrintCompositor *compositor); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, - GtkPrintContext *context, - gint page_nr); +void gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor, + GtkPrintContext *context, + gint page_nr); G_END_DECLS -- GitLab From 57592b7f2cc288ef7793aeb55c9737af2a9798fd Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:19:17 -0800 Subject: [PATCH 027/248] search: modernize GtkSourceSearchContext - Use G_DECLARE_ macros - Fix multi-line function indentation - Make final --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcesearchcontext.c | 960 +++++++++++++------------ gtksourceview/gtksourcesearchcontext.h | 166 ++--- 3 files changed, 544 insertions(+), 583 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index c2aebf57..331c68f1 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchSettings, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSpaceDrawer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref) diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c index ae90ec19..427be847 100644 --- a/gtksourceview/gtksourcesearchcontext.c +++ b/gtksourceview/gtksourcesearchcontext.c @@ -301,8 +301,10 @@ enum PROP_REGEX_ERROR }; -struct _GtkSourceSearchContextPrivate +struct _GtkSourceSearchContext { + GObject parent_instance; + /* Weak ref to the buffer. The buffer has also a weak ref to the search * context. A strong ref in either direction would prevent the pointed * object to be finalized. @@ -364,9 +366,9 @@ typedef struct guint is_forward : 1; } ForwardBackwardData; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceSearchContext, gtk_source_search_context, G_TYPE_OBJECT); +G_DEFINE_TYPE (GtkSourceSearchContext, gtk_source_search_context, G_TYPE_OBJECT) -static void install_idle_scan (GtkSourceSearchContext *search); +static void install_idle_scan (GtkSourceSearchContext *search); #ifdef ENABLE_DEBUG static void @@ -383,23 +385,23 @@ print_region (GtkSourceRegion *region) static void sync_found_tag (GtkSourceSearchContext *search) { - GtkSourceStyle *style = search->priv->match_style; + GtkSourceStyle *style = search->match_style; GtkSourceStyleScheme *style_scheme; - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return; } - if (!search->priv->highlight) + if (!search->highlight) { - gtk_source_style_apply (NULL, search->priv->found_tag); + gtk_source_style_apply (NULL, search->found_tag); return; } if (style == NULL) { - style_scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (search->priv->buffer)); + style_scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (search->buffer)); if (style_scheme != NULL) { @@ -412,12 +414,12 @@ sync_found_tag (GtkSourceSearchContext *search) g_warning ("No match style defined nor 'search-match' style available."); } - gtk_source_style_apply (style, search->priv->found_tag); + gtk_source_style_apply (style, search->found_tag); } static void text_tag_set_highest_priority (GtkTextTag *tag, - GtkTextBuffer *buffer) + GtkTextBuffer *buffer) { GtkTextTagTable *table; gint n; @@ -432,8 +434,8 @@ text_tag_set_highest_priority (GtkTextTag *tag, */ static gboolean get_first_subregion (GtkSourceRegion *region, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { GtkSourceRegionIter region_iter; @@ -467,8 +469,8 @@ get_first_subregion (GtkSourceRegion *region, */ static gboolean get_last_subregion (GtkSourceRegion *region, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { GtkSourceRegionIter region_iter; gboolean found = FALSE; @@ -508,43 +510,43 @@ get_last_subregion (GtkSourceRegion *region, static void clear_task (GtkSourceSearchContext *search) { - g_clear_object (&search->priv->task_region); + g_clear_object (&search->task_region); - if (search->priv->task != NULL) + if (search->task != NULL) { - GCancellable *cancellable = g_task_get_cancellable (search->priv->task); + GCancellable *cancellable = g_task_get_cancellable (search->task); if (cancellable != NULL) { g_cancellable_cancel (cancellable); - g_task_return_error_if_cancelled (search->priv->task); + g_task_return_error_if_cancelled (search->task); } - g_clear_object (&search->priv->task); + g_clear_object (&search->task); } } static void clear_search (GtkSourceSearchContext *search) { - g_clear_object (&search->priv->scan_region); - g_clear_object (&search->priv->high_priority_region); + g_clear_object (&search->scan_region); + g_clear_object (&search->high_priority_region); - if (search->priv->idle_scan_id != 0) + if (search->idle_scan_id != 0) { - g_source_remove (search->priv->idle_scan_id); - search->priv->idle_scan_id = 0; + g_source_remove (search->idle_scan_id); + search->idle_scan_id = 0; } - if (search->priv->regex_error != NULL) + if (search->regex_error != NULL) { - g_clear_error (&search->priv->regex_error); + g_clear_error (&search->regex_error); g_object_notify (G_OBJECT (search), "regex-error"); } clear_task (search); - search->priv->occurrences_count = 0; + search->occurrences_count = 0; } static GtkTextSearchFlags @@ -552,7 +554,7 @@ get_text_search_flags (GtkSourceSearchContext *search) { GtkTextSearchFlags flags = GTK_TEXT_SEARCH_TEXT_ONLY | GTK_TEXT_SEARCH_VISIBLE_ONLY; - if (!gtk_source_search_settings_get_case_sensitive (search->priv->settings)) + if (!gtk_source_search_settings_get_case_sensitive (search->settings)) { flags |= GTK_TEXT_SEARCH_CASE_INSENSITIVE; } @@ -563,11 +565,11 @@ get_text_search_flags (GtkSourceSearchContext *search) /* @start_pos is in bytes. */ static void regex_search_get_real_start (GtkSourceSearchContext *search, - const GtkTextIter *start, - GtkTextIter *real_start, - gint *start_pos) + const GtkTextIter *start, + GtkTextIter *real_start, + gint *start_pos) { - gint max_lookbehind = g_regex_get_max_lookbehind (search->priv->regex); + gint max_lookbehind = g_regex_get_max_lookbehind (search->regex); gint i; gchar *text; @@ -589,7 +591,7 @@ regex_search_get_real_start (GtkSourceSearchContext *search, static GRegexMatchFlags regex_search_get_match_options (const GtkTextIter *real_start, - const GtkTextIter *end) + const GtkTextIter *end) { GRegexMatchFlags match_options = 0; @@ -620,12 +622,12 @@ regex_search_get_match_options (const GtkTextIter *real_start, */ static gboolean regex_search_fetch_match (GMatchInfo *match_info, - const gchar *subject, - gssize subject_length, - GtkTextIter *iter, - gint *iter_byte_pos, - GtkTextIter *match_start, - GtkTextIter *match_end) + const gchar *subject, + gssize subject_length, + GtkTextIter *iter, + gint *iter_byte_pos, + GtkTextIter *match_start, + GtkTextIter *match_end) { gint start_byte_pos; gint end_byte_pos; @@ -679,11 +681,11 @@ regex_search_fetch_match (GMatchInfo *match_info, */ static gboolean basic_forward_regex_search (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end, - GtkTextIter *real_end, - const GtkTextIter *limit) + const GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end, + GtkTextIter *real_end, + const GtkTextIter *limit) { GtkTextIter real_start; GtkTextIter end; @@ -691,8 +693,8 @@ basic_forward_regex_search (GtkSourceSearchContext *search, gboolean found = FALSE; gint nb_lines = 1; - if (search->priv->regex == NULL || - search->priv->regex_error != NULL) + if (search->regex == NULL || + search->regex_error != NULL) { return FALSE; } @@ -701,7 +703,7 @@ basic_forward_regex_search (GtkSourceSearchContext *search, if (limit == NULL) { - gtk_text_buffer_get_end_iter (search->priv->buffer, &end); + gtk_text_buffer_get_end_iter (search->buffer, &end); } else { @@ -723,13 +725,13 @@ basic_forward_regex_search (GtkSourceSearchContext *search, subject = gtk_text_iter_get_visible_text (&real_start, &end); subject_length = strlen (subject); - g_regex_match_full (search->priv->regex, + g_regex_match_full (search->regex, subject, subject_length, start_pos, match_options, &match_info, - &search->priv->regex_error); + &search->regex_error); iter = real_start; iter_byte_pos = 0; @@ -762,7 +764,7 @@ basic_forward_regex_search (GtkSourceSearchContext *search, found = FALSE; } - if (search->priv->regex_error != NULL) + if (search->regex_error != NULL) { g_object_notify (G_OBJECT (search), "regex-error"); found = FALSE; @@ -796,13 +798,13 @@ basic_forward_regex_search (GtkSourceSearchContext *search, static gboolean basic_forward_search (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GtkTextIter *match_start, - GtkTextIter *match_end, - const GtkTextIter *limit) + const GtkTextIter *iter, + GtkTextIter *match_start, + GtkTextIter *match_end, + const GtkTextIter *limit) { GtkTextIter begin_search = *iter; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); GtkTextSearchFlags flags; if (search_text == NULL) @@ -810,7 +812,7 @@ basic_forward_search (GtkSourceSearchContext *search, return FALSE; } - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { return basic_forward_regex_search (search, iter, @@ -831,7 +833,7 @@ basic_forward_search (GtkSourceSearchContext *search, match_end, limit); - if (!found || !gtk_source_search_settings_get_at_word_boundaries (search->priv->settings)) + if (!found || !gtk_source_search_settings_get_at_word_boundaries (search->settings)) { return found; } @@ -851,25 +853,25 @@ basic_forward_search (GtkSourceSearchContext *search, */ static gboolean basic_backward_regex_search (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end, - const GtkTextIter *limit) + const GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end, + const GtkTextIter *limit) { GtkTextIter lower_bound; GtkTextIter m_start; GtkTextIter m_end; gboolean found = FALSE; - if (search->priv->regex == NULL || - search->priv->regex_error != NULL) + if (search->regex == NULL || + search->regex_error != NULL) { return FALSE; } if (limit == NULL) { - gtk_text_buffer_get_start_iter (search->priv->buffer, &lower_bound); + gtk_text_buffer_get_start_iter (search->buffer, &lower_bound); } else { @@ -898,13 +900,13 @@ basic_backward_regex_search (GtkSourceSearchContext *search, static gboolean basic_backward_search (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GtkTextIter *match_start, - GtkTextIter *match_end, - const GtkTextIter *limit) + const GtkTextIter *iter, + GtkTextIter *match_start, + GtkTextIter *match_end, + const GtkTextIter *limit) { GtkTextIter begin_search = *iter; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); GtkTextSearchFlags flags; if (search_text == NULL) @@ -912,7 +914,7 @@ basic_backward_search (GtkSourceSearchContext *search, return FALSE; } - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { return basic_backward_regex_search (search, iter, @@ -932,7 +934,7 @@ basic_backward_search (GtkSourceSearchContext *search, match_end, limit); - if (!found || !gtk_source_search_settings_get_at_word_boundaries (search->priv->settings)) + if (!found || !gtk_source_search_settings_get_at_word_boundaries (search->settings)) { return found; } @@ -974,23 +976,23 @@ forward_backward_data_free (ForwardBackwardData *data) /* Returns TRUE if finished. */ static gboolean smart_forward_search_async_step (GtkSourceSearchContext *search, - GtkTextIter *start_at, - gboolean *wrapped_around) + GtkTextIter *start_at, + gboolean *wrapped_around) { GtkTextIter iter = *start_at; GtkTextIter limit; GtkTextIter region_start = *start_at; GtkSourceRegion *region = NULL; ForwardBackwardData *task_data; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); if (gtk_text_iter_is_end (start_at)) { if (search_text != NULL && !*wrapped_around && - gtk_source_search_settings_get_wrap_around (search->priv->settings)) + gtk_source_search_settings_get_wrap_around (search->settings)) { - gtk_text_buffer_get_start_iter (search->priv->buffer, start_at); + gtk_text_buffer_get_start_iter (search->buffer, start_at); *wrapped_around = TRUE; return FALSE; } @@ -1000,30 +1002,30 @@ smart_forward_search_async_step (GtkSourceSearchContext *search, task_data->is_forward = TRUE; task_data->wrapped_around = *wrapped_around; - g_task_return_pointer (search->priv->task, + g_task_return_pointer (search->task, task_data, (GDestroyNotify)forward_backward_data_free); - g_clear_object (&search->priv->task); + g_clear_object (&search->task); return TRUE; } - if (!gtk_text_iter_has_tag (&iter, search->priv->found_tag)) + if (!gtk_text_iter_has_tag (&iter, search->found_tag)) { - gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&iter, search->found_tag); } - else if (!gtk_text_iter_starts_tag (&iter, search->priv->found_tag)) + else if (!gtk_text_iter_starts_tag (&iter, search->found_tag)) { - gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&iter, search->found_tag); region_start = iter; } limit = iter; - gtk_text_iter_forward_to_tag_toggle (&limit, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&limit, search->found_tag); - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, ®ion_start, &limit); } @@ -1046,23 +1048,23 @@ smart_forward_search_async_step (GtkSourceSearchContext *search, task_data = g_slice_new0 (ForwardBackwardData); task_data->found = TRUE; task_data->match_start = - gtk_text_buffer_create_mark (search->priv->buffer, + gtk_text_buffer_create_mark (search->buffer, NULL, &match_start, TRUE); task_data->match_end = - gtk_text_buffer_create_mark (search->priv->buffer, + gtk_text_buffer_create_mark (search->buffer, NULL, &match_end, FALSE); task_data->is_forward = TRUE; task_data->wrapped_around = *wrapped_around; - g_task_return_pointer (search->priv->task, + g_task_return_pointer (search->task, task_data, (GDestroyNotify)forward_backward_data_free); - g_clear_object (&search->priv->task); + g_clear_object (&search->task); return TRUE; } @@ -1073,17 +1075,17 @@ smart_forward_search_async_step (GtkSourceSearchContext *search, task_data = g_slice_new0 (ForwardBackwardData); task_data->is_forward = TRUE; task_data->wrapped_around = *wrapped_around; - task_data->start_at = gtk_text_buffer_create_mark (search->priv->buffer, + task_data->start_at = gtk_text_buffer_create_mark (search->buffer, NULL, start_at, TRUE); - g_task_set_task_data (search->priv->task, + g_task_set_task_data (search->task, task_data, (GDestroyNotify)forward_backward_data_free); - g_clear_object (&search->priv->task_region); - search->priv->task_region = region; + g_clear_object (&search->task_region); + search->task_region = region; install_idle_scan (search); @@ -1096,8 +1098,8 @@ smart_forward_search_async_step (GtkSourceSearchContext *search, static void smart_forward_search_async (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - gboolean wrapped_around) + const GtkTextIter *start_at, + gboolean wrapped_around) { GtkTextIter iter = *start_at; @@ -1111,23 +1113,23 @@ smart_forward_search_async (GtkSourceSearchContext *search, /* Returns TRUE if finished. */ static gboolean smart_backward_search_async_step (GtkSourceSearchContext *search, - GtkTextIter *start_at, - gboolean *wrapped_around) + GtkTextIter *start_at, + gboolean *wrapped_around) { GtkTextIter iter = *start_at; GtkTextIter limit; GtkTextIter region_end = *start_at; GtkSourceRegion *region = NULL; ForwardBackwardData *task_data; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); if (gtk_text_iter_is_start (start_at)) { if (search_text != NULL && !*wrapped_around && - gtk_source_search_settings_get_wrap_around (search->priv->settings)) + gtk_source_search_settings_get_wrap_around (search->settings)) { - gtk_text_buffer_get_end_iter (search->priv->buffer, start_at); + gtk_text_buffer_get_end_iter (search->buffer, start_at); *wrapped_around = TRUE; return FALSE; } @@ -1137,32 +1139,32 @@ smart_backward_search_async_step (GtkSourceSearchContext *search, task_data->is_forward = FALSE; task_data->wrapped_around = *wrapped_around; - g_task_return_pointer (search->priv->task, + g_task_return_pointer (search->task, task_data, (GDestroyNotify)forward_backward_data_free); - g_clear_object (&search->priv->task); + g_clear_object (&search->task); return TRUE; } - if (gtk_text_iter_starts_tag (&iter, search->priv->found_tag) || - (!gtk_text_iter_has_tag (&iter, search->priv->found_tag) && - !gtk_text_iter_ends_tag (&iter, search->priv->found_tag))) + if (gtk_text_iter_starts_tag (&iter, search->found_tag) || + (!gtk_text_iter_has_tag (&iter, search->found_tag) && + !gtk_text_iter_ends_tag (&iter, search->found_tag))) { - gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&iter, search->found_tag); } - else if (gtk_text_iter_has_tag (&iter, search->priv->found_tag)) + else if (gtk_text_iter_has_tag (&iter, search->found_tag)) { - gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&iter, search->found_tag); region_end = iter; } limit = iter; - gtk_text_iter_backward_to_tag_toggle (&limit, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&limit, search->found_tag); - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, &limit, ®ion_end); } @@ -1185,23 +1187,23 @@ smart_backward_search_async_step (GtkSourceSearchContext *search, task_data = g_slice_new0 (ForwardBackwardData); task_data->found = TRUE; task_data->match_start = - gtk_text_buffer_create_mark (search->priv->buffer, + gtk_text_buffer_create_mark (search->buffer, NULL, &match_start, TRUE); task_data->match_end = - gtk_text_buffer_create_mark (search->priv->buffer, + gtk_text_buffer_create_mark (search->buffer, NULL, &match_end, FALSE); task_data->is_forward = FALSE; task_data->wrapped_around = *wrapped_around; - g_task_return_pointer (search->priv->task, + g_task_return_pointer (search->task, task_data, (GDestroyNotify)forward_backward_data_free); - g_clear_object (&search->priv->task); + g_clear_object (&search->task); return TRUE; } @@ -1212,17 +1214,17 @@ smart_backward_search_async_step (GtkSourceSearchContext *search, task_data = g_slice_new0 (ForwardBackwardData); task_data->is_forward = FALSE; task_data->wrapped_around = *wrapped_around; - task_data->start_at = gtk_text_buffer_create_mark (search->priv->buffer, + task_data->start_at = gtk_text_buffer_create_mark (search->buffer, NULL, start_at, TRUE); - g_task_set_task_data (search->priv->task, + g_task_set_task_data (search->task, task_data, (GDestroyNotify)forward_backward_data_free); - g_clear_object (&search->priv->task_region); - search->priv->task_region = region; + g_clear_object (&search->task_region); + search->task_region = region; install_idle_scan (search); @@ -1235,8 +1237,8 @@ smart_backward_search_async_step (GtkSourceSearchContext *search, static void smart_backward_search_async (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - gboolean wrapped_around) + const GtkTextIter *start_at, + gboolean wrapped_around) { GtkTextIter iter = *start_at; @@ -1251,8 +1253,8 @@ smart_backward_search_async (GtkSourceSearchContext *search, */ static void adjust_subregion (GtkSourceSearchContext *search, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { DEBUG ({ g_print ("adjust_subregion(), before adjusting: [%u (%u), %u (%u)]\n", @@ -1260,8 +1262,8 @@ adjust_subregion (GtkSourceSearchContext *search, gtk_text_iter_get_line (end), gtk_text_iter_get_offset (end)); }); - gtk_text_iter_backward_lines (start, MAX (0, search->priv->text_nb_lines - 1)); - gtk_text_iter_forward_lines (end, MAX (0, search->priv->text_nb_lines - 1)); + gtk_text_iter_backward_lines (start, MAX (0, search->text_nb_lines - 1)); + gtk_text_iter_forward_lines (end, MAX (0, search->text_nb_lines - 1)); if (!gtk_text_iter_starts_line (start)) { @@ -1281,12 +1283,12 @@ adjust_subregion (GtkSourceSearchContext *search, * not. */ - if (gtk_text_iter_has_tag (start, search->priv->found_tag)) + if (gtk_text_iter_has_tag (start, search->found_tag)) { - if (gtk_source_region_is_empty (search->priv->scan_region)) + if (gtk_source_region_is_empty (search->scan_region)) { /* 'start' is in a correct match, we can skip it. */ - gtk_text_iter_forward_to_tag_toggle (start, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (start, search->found_tag); } else { @@ -1294,14 +1296,14 @@ adjust_subregion (GtkSourceSearchContext *search, GtkTextIter tag_end = *start; GtkSourceRegion *region; - if (!gtk_text_iter_starts_tag (&tag_start, search->priv->found_tag)) + if (!gtk_text_iter_starts_tag (&tag_start, search->found_tag)) { - gtk_text_iter_backward_to_tag_toggle (&tag_start, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&tag_start, search->found_tag); } - gtk_text_iter_forward_to_tag_toggle (&tag_end, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&tag_end, search->found_tag); - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, &tag_start, &tag_end); @@ -1327,15 +1329,15 @@ adjust_subregion (GtkSourceSearchContext *search, /* Symmetric for 'end'. */ - if (gtk_text_iter_has_tag (end, search->priv->found_tag)) + if (gtk_text_iter_has_tag (end, search->found_tag)) { - if (gtk_source_region_is_empty (search->priv->scan_region)) + if (gtk_source_region_is_empty (search->scan_region)) { /* 'end' is in a correct match, we can skip it. */ - if (!gtk_text_iter_starts_tag (end, search->priv->found_tag)) + if (!gtk_text_iter_starts_tag (end, search->found_tag)) { - gtk_text_iter_backward_to_tag_toggle (end, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (end, search->found_tag); } } else @@ -1344,14 +1346,14 @@ adjust_subregion (GtkSourceSearchContext *search, GtkTextIter tag_end = *end; GtkSourceRegion *region; - if (!gtk_text_iter_starts_tag (&tag_start, search->priv->found_tag)) + if (!gtk_text_iter_starts_tag (&tag_start, search->found_tag)) { - gtk_text_iter_backward_to_tag_toggle (&tag_start, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&tag_start, search->found_tag); } - gtk_text_iter_forward_to_tag_toggle (&tag_end, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&tag_end, search->found_tag); - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, &tag_start, &tag_end); @@ -1388,13 +1390,13 @@ adjust_subregion (GtkSourceSearchContext *search, */ static gboolean smart_forward_search_without_scanning (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end, - const GtkTextIter *stop_at) + const GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end, + const GtkTextIter *stop_at) { GtkTextIter iter; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); g_assert (start_at != NULL); g_assert (match_start != NULL); @@ -1412,17 +1414,17 @@ smart_forward_search_without_scanning (GtkSourceSearchContext *search, { GtkTextIter limit; - if (!gtk_text_iter_has_tag (&iter, search->priv->found_tag)) + if (!gtk_text_iter_has_tag (&iter, search->found_tag)) { - gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&iter, search->found_tag); } - else if (!gtk_text_iter_starts_tag (&iter, search->priv->found_tag)) + else if (!gtk_text_iter_starts_tag (&iter, search->found_tag)) { - gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&iter, search->found_tag); } limit = iter; - gtk_text_iter_forward_to_tag_toggle (&limit, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&limit, search->found_tag); if (gtk_text_iter_compare (stop_at, &limit) < 0) { @@ -1450,50 +1452,50 @@ smart_forward_search_without_scanning (GtkSourceSearchContext *search, */ static void remove_occurrences_in_range (GtkSourceSearchContext *search, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { GtkTextIter iter; GtkTextIter match_start; GtkTextIter match_end; - if ((gtk_text_iter_has_tag (start, search->priv->found_tag) && - !gtk_text_iter_starts_tag (start, search->priv->found_tag)) || - (gtk_source_search_settings_get_at_word_boundaries (search->priv->settings) && - gtk_text_iter_ends_tag (start, search->priv->found_tag))) + if ((gtk_text_iter_has_tag (start, search->found_tag) && + !gtk_text_iter_starts_tag (start, search->found_tag)) || + (gtk_source_search_settings_get_at_word_boundaries (search->settings) && + gtk_text_iter_ends_tag (start, search->found_tag))) { - gtk_text_iter_backward_to_tag_toggle (start, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (start, search->found_tag); } - if ((gtk_text_iter_has_tag (end, search->priv->found_tag) && - !gtk_text_iter_starts_tag (end, search->priv->found_tag)) || - (gtk_source_search_settings_get_at_word_boundaries (search->priv->settings) && - gtk_text_iter_starts_tag (end, search->priv->found_tag))) + if ((gtk_text_iter_has_tag (end, search->found_tag) && + !gtk_text_iter_starts_tag (end, search->found_tag)) || + (gtk_source_search_settings_get_at_word_boundaries (search->settings) && + gtk_text_iter_starts_tag (end, search->found_tag))) { - gtk_text_iter_forward_to_tag_toggle (end, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (end, search->found_tag); } iter = *start; while (smart_forward_search_without_scanning (search, &iter, &match_start, &match_end, end)) { - if (search->priv->scan_region == NULL) + if (search->scan_region == NULL) { /* The occurrence has already been scanned, and thus * occurrence_count take it into account. */ - search->priv->occurrences_count--; + search->occurrences_count--; } else { GtkSourceRegion *region; - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, &match_start, &match_end); if (gtk_source_region_is_empty (region)) { - search->priv->occurrences_count--; + search->occurrences_count--; } g_clear_object (®ion); @@ -1502,48 +1504,48 @@ remove_occurrences_in_range (GtkSourceSearchContext *search, iter = match_end; } - gtk_text_buffer_remove_tag (search->priv->buffer, - search->priv->found_tag, + gtk_text_buffer_remove_tag (search->buffer, + search->found_tag, start, end); } static void scan_subregion (GtkSourceSearchContext *search, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { GtkTextIter iter; GtkTextIter *limit; gboolean found = TRUE; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); /* Make sure the 'found' tag has the priority over syntax highlighting * tags. */ - text_tag_set_highest_priority (search->priv->found_tag, - search->priv->buffer); + text_tag_set_highest_priority (search->found_tag, + search->buffer); adjust_subregion (search, start, end); remove_occurrences_in_range (search, start, end); - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { DEBUG ({ g_print ("Region to scan, before:\n"); - print_region (search->priv->scan_region); + print_region (search->scan_region); }); - gtk_source_region_subtract_subregion (search->priv->scan_region, start, end); + gtk_source_region_subtract_subregion (search->scan_region, start, end); DEBUG ({ g_print ("Region to scan, after:\n"); - print_region (search->priv->scan_region); + print_region (search->scan_region); }); } - if (search->priv->task_region != NULL) + if (search->task_region != NULL) { - gtk_source_region_subtract_subregion (search->priv->task_region, start, end); + gtk_source_region_subtract_subregion (search->task_region, start, end); } if (search_text == NULL) @@ -1572,12 +1574,12 @@ scan_subregion (GtkSourceSearchContext *search, if (found) { - gtk_text_buffer_apply_tag (search->priv->buffer, - search->priv->found_tag, + gtk_text_buffer_apply_tag (search->buffer, + search->found_tag, &match_start, &match_end); - search->priv->occurrences_count++; + search->occurrences_count++; } iter = match_end; @@ -1587,7 +1589,7 @@ scan_subregion (GtkSourceSearchContext *search, static void scan_all_region (GtkSourceSearchContext *search, - GtkSourceRegion *region) + GtkSourceRegion *region) { GtkSourceRegionIter region_iter; @@ -1619,7 +1621,7 @@ scan_all_region (GtkSourceSearchContext *search, */ static void scan_region_forward (GtkSourceSearchContext *search, - GtkSourceRegion *region) + GtkSourceRegion *region) { gint nb_remaining_lines = SCAN_BATCH_SIZE; GtkTextIter start; @@ -1653,7 +1655,7 @@ scan_region_forward (GtkSourceSearchContext *search, /* Same as scan_region_forward(), but begins the scan at the end of the region. */ static void scan_region_backward (GtkSourceSearchContext *search, - GtkSourceRegion *region) + GtkSourceRegion *region) { gint nb_remaining_lines = SCAN_BATCH_SIZE; GtkTextIter start; @@ -1687,12 +1689,12 @@ scan_region_backward (GtkSourceSearchContext *search, static void resume_task (GtkSourceSearchContext *search) { - ForwardBackwardData *task_data = g_task_get_task_data (search->priv->task); + ForwardBackwardData *task_data = g_task_get_task_data (search->task); GtkTextIter start_at; - g_clear_object (&search->priv->task_region); + g_clear_object (&search->task_region); - gtk_text_buffer_get_iter_at_mark (search->priv->buffer, + gtk_text_buffer_get_iter_at_mark (search->buffer, &start_at, task_data->start_at); @@ -1713,15 +1715,15 @@ resume_task (GtkSourceSearchContext *search) static void scan_task_region (GtkSourceSearchContext *search) { - ForwardBackwardData *task_data = g_task_get_task_data (search->priv->task); + ForwardBackwardData *task_data = g_task_get_task_data (search->task); if (task_data->is_forward) { - scan_region_forward (search, search->priv->task_region); + scan_region_forward (search, search->task_region); } else { - scan_region_backward (search, search->priv->task_region); + scan_region_backward (search, search->task_region); } resume_task (search); @@ -1730,33 +1732,33 @@ scan_task_region (GtkSourceSearchContext *search) static gboolean idle_scan_normal_search (GtkSourceSearchContext *search) { - if (search->priv->high_priority_region != NULL) + if (search->high_priority_region != NULL) { /* Normally the high priority region is not really big, since it * is the visible area on the screen. So we can highlight it in * one batch. */ - scan_all_region (search, search->priv->high_priority_region); + scan_all_region (search, search->high_priority_region); - g_clear_object (&search->priv->high_priority_region); + g_clear_object (&search->high_priority_region); return G_SOURCE_CONTINUE; } - if (search->priv->task_region != NULL) + if (search->task_region != NULL) { scan_task_region (search); return G_SOURCE_CONTINUE; } - scan_region_forward (search, search->priv->scan_region); + scan_region_forward (search, search->scan_region); - if (gtk_source_region_is_empty (search->priv->scan_region)) + if (gtk_source_region_is_empty (search->scan_region)) { - search->priv->idle_scan_id = 0; + search->idle_scan_id = 0; g_object_notify (G_OBJECT (search), "occurrences-count"); - g_clear_object (&search->priv->scan_region); + g_clear_object (&search->scan_region); return G_SOURCE_REMOVE; } @@ -1777,8 +1779,8 @@ regex_search_handle_high_priority_region (GtkSourceSearchContext *search) GtkSourceRegion *region; GtkSourceRegionIter region_iter; - region = gtk_source_region_intersect_region (search->priv->high_priority_region, - search->priv->scan_region); + region = gtk_source_region_intersect_region (search->high_priority_region, + search->scan_region); if (region == NULL) { @@ -1799,8 +1801,8 @@ regex_search_handle_high_priority_region (GtkSourceSearchContext *search) break; } - gtk_text_buffer_remove_tag (search->priv->buffer, - search->priv->found_tag, + gtk_text_buffer_remove_tag (search->buffer, + search->found_tag, &subregion_start, &subregion_end); @@ -1813,9 +1815,9 @@ regex_search_handle_high_priority_region (GtkSourceSearchContext *search) /* Returns TRUE if the segment is finished, and FALSE on partial match. */ static gboolean regex_search_scan_segment (GtkSourceSearchContext *search, - const GtkTextIter *segment_start, - const GtkTextIter *segment_end, - GtkTextIter *stopped_at) + const GtkTextIter *segment_start, + const GtkTextIter *segment_end, + GtkTextIter *stopped_at) { GtkTextIter real_start; gint start_pos; @@ -1831,13 +1833,13 @@ regex_search_scan_segment (GtkSourceSearchContext *search, g_assert (stopped_at != NULL); - gtk_text_buffer_remove_tag (search->priv->buffer, - search->priv->found_tag, + gtk_text_buffer_remove_tag (search->buffer, + search->found_tag, segment_start, segment_end); - if (search->priv->regex == NULL || - search->priv->regex_error != NULL) + if (search->regex == NULL || + search->regex_error != NULL) { *stopped_at = *segment_end; return TRUE; @@ -1885,13 +1887,13 @@ regex_search_scan_segment (GtkSourceSearchContext *search, g_free (subject_escaped); }); - g_regex_match_full (search->priv->regex, + g_regex_match_full (search->regex, subject, subject_length, start_pos, match_options, &match_info, - &search->priv->regex_error); + &search->regex_error); iter = real_start; iter_byte_pos = 0; @@ -1904,8 +1906,8 @@ regex_search_scan_segment (GtkSourceSearchContext *search, &match_start, &match_end)) { - gtk_text_buffer_apply_tag (search->priv->buffer, - search->priv->found_tag, + gtk_text_buffer_apply_tag (search->buffer, + search->found_tag, &match_start, &match_end); @@ -1917,12 +1919,12 @@ regex_search_scan_segment (GtkSourceSearchContext *search, g_free (match_escaped); }); - search->priv->occurrences_count++; + search->occurrences_count++; - g_match_info_next (match_info, &search->priv->regex_error); + g_match_info_next (match_info, &search->regex_error); } - if (search->priv->regex_error != NULL) + if (search->regex_error != NULL) { g_object_notify (G_OBJECT (search), "regex-error"); } @@ -1958,8 +1960,8 @@ regex_search_scan_segment (GtkSourceSearchContext *search, static void regex_search_scan_chunk (GtkSourceSearchContext *search, - const GtkTextIter *chunk_start, - const GtkTextIter *chunk_end) + const GtkTextIter *chunk_start, + const GtkTextIter *chunk_end) { GtkTextIter segment_start = *chunk_start; @@ -1989,13 +1991,13 @@ regex_search_scan_chunk (GtkSourceSearchContext *search, segment_start = stopped_at; } - gtk_source_region_subtract_subregion (search->priv->scan_region, + gtk_source_region_subtract_subregion (search->scan_region, chunk_start, &segment_start); - if (search->priv->task_region != NULL) + if (search->task_region != NULL) { - gtk_source_region_subtract_subregion (search->priv->task_region, + gtk_source_region_subtract_subregion (search->task_region, chunk_start, &segment_start); } @@ -2007,12 +2009,12 @@ regex_search_scan_next_chunk (GtkSourceSearchContext *search) GtkTextIter chunk_start; GtkTextIter chunk_end; - if (gtk_source_region_is_empty (search->priv->scan_region)) + if (gtk_source_region_is_empty (search->scan_region)) { return; } - if (!gtk_source_region_get_bounds (search->priv->scan_region, &chunk_start, NULL)) + if (!gtk_source_region_get_bounds (search->scan_region, &chunk_start, NULL)) { return; } @@ -2026,16 +2028,16 @@ regex_search_scan_next_chunk (GtkSourceSearchContext *search) static gboolean idle_scan_regex_search (GtkSourceSearchContext *search) { - if (search->priv->high_priority_region != NULL) + if (search->high_priority_region != NULL) { regex_search_handle_high_priority_region (search); - g_clear_object (&search->priv->high_priority_region); + g_clear_object (&search->high_priority_region); return G_SOURCE_CONTINUE; } regex_search_scan_next_chunk (search); - if (search->priv->task != NULL) + if (search->task != NULL) { /* Always resume the task, even if the task region has not been * fully scanned. The task region can be huge (the whole @@ -2049,13 +2051,13 @@ idle_scan_regex_search (GtkSourceSearchContext *search) return G_SOURCE_CONTINUE; } - if (gtk_source_region_is_empty (search->priv->scan_region)) + if (gtk_source_region_is_empty (search->scan_region)) { - search->priv->idle_scan_id = 0; + search->idle_scan_id = 0; g_object_notify (G_OBJECT (search), "occurrences-count"); - g_clear_object (&search->priv->scan_region); + g_clear_object (&search->scan_region); return G_SOURCE_REMOVE; } @@ -2065,14 +2067,14 @@ idle_scan_regex_search (GtkSourceSearchContext *search) static gboolean idle_scan_cb (GtkSourceSearchContext *search) { - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { - search->priv->idle_scan_id = 0; + search->idle_scan_id = 0; clear_search (search); return G_SOURCE_REMOVE; } - return gtk_source_search_settings_get_regex_enabled (search->priv->settings) ? + return gtk_source_search_settings_get_regex_enabled (search->settings) ? idle_scan_regex_search (search) : idle_scan_normal_search (search); } @@ -2080,40 +2082,40 @@ idle_scan_cb (GtkSourceSearchContext *search) static void install_idle_scan (GtkSourceSearchContext *search) { - if (search->priv->idle_scan_id == 0) + if (search->idle_scan_id == 0) { - search->priv->idle_scan_id = g_idle_add ((GSourceFunc)idle_scan_cb, search); + search->idle_scan_id = g_idle_add ((GSourceFunc)idle_scan_cb, search); } } /* Returns TRUE when finished. */ static gboolean smart_forward_search_step (GtkSourceSearchContext *search, - GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end) + GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end) { GtkTextIter iter = *start_at; GtkTextIter limit; GtkTextIter region_start = *start_at; GtkSourceRegion *region = NULL; - if (!gtk_text_iter_has_tag (&iter, search->priv->found_tag)) + if (!gtk_text_iter_has_tag (&iter, search->found_tag)) { - gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&iter, search->found_tag); } - else if (!gtk_text_iter_starts_tag (&iter, search->priv->found_tag)) + else if (!gtk_text_iter_starts_tag (&iter, search->found_tag)) { - gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&iter, search->found_tag); region_start = iter; } limit = iter; - gtk_text_iter_forward_to_tag_toggle (&limit, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&limit, search->found_tag); - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, ®ion_start, &limit); } @@ -2139,7 +2141,7 @@ smart_forward_search_step (GtkSourceSearchContext *search, /* Scan a chunk of the buffer, not the whole 'region'. An occurrence can * be found before the 'region' is scanned entirely. */ - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { regex_search_scan_next_chunk (search); } @@ -2156,12 +2158,12 @@ smart_forward_search_step (GtkSourceSearchContext *search, /* Doesn't wrap around. */ static gboolean smart_forward_search (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end) + const GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end) { GtkTextIter iter = *start_at; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); g_return_val_if_fail (match_start != NULL, FALSE); g_return_val_if_fail (match_end != NULL, FALSE); @@ -2185,33 +2187,33 @@ smart_forward_search (GtkSourceSearchContext *search, /* Returns TRUE when finished. */ static gboolean smart_backward_search_step (GtkSourceSearchContext *search, - GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end) + GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end) { GtkTextIter iter = *start_at; GtkTextIter limit; GtkTextIter region_end = *start_at; GtkSourceRegion *region = NULL; - if (gtk_text_iter_starts_tag (&iter, search->priv->found_tag) || - (!gtk_text_iter_has_tag (&iter, search->priv->found_tag) && - !gtk_text_iter_ends_tag (&iter, search->priv->found_tag))) + if (gtk_text_iter_starts_tag (&iter, search->found_tag) || + (!gtk_text_iter_has_tag (&iter, search->found_tag) && + !gtk_text_iter_ends_tag (&iter, search->found_tag))) { - gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&iter, search->found_tag); } - else if (gtk_text_iter_has_tag (&iter, search->priv->found_tag)) + else if (gtk_text_iter_has_tag (&iter, search->found_tag)) { - gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag); + gtk_text_iter_forward_to_tag_toggle (&iter, search->found_tag); region_end = iter; } limit = iter; - gtk_text_iter_backward_to_tag_toggle (&limit, search->priv->found_tag); + gtk_text_iter_backward_to_tag_toggle (&limit, search->found_tag); - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, &limit, ®ion_end); } @@ -2237,7 +2239,7 @@ smart_backward_search_step (GtkSourceSearchContext *search, /* Scan a chunk of the buffer, not the whole 'region'. An occurrence can * be found before the 'region' is scanned entirely. */ - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { regex_search_scan_next_chunk (search); } @@ -2254,12 +2256,12 @@ smart_backward_search_step (GtkSourceSearchContext *search, /* Doesn't wrap around. */ static gboolean smart_backward_search (GtkSourceSearchContext *search, - const GtkTextIter *start_at, - GtkTextIter *match_start, - GtkTextIter *match_end) + const GtkTextIter *start_at, + GtkTextIter *match_start, + GtkTextIter *match_end) { GtkTextIter iter = *start_at; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); g_return_val_if_fail (match_start != NULL, FALSE); g_return_val_if_fail (match_end != NULL, FALSE); @@ -2282,27 +2284,27 @@ smart_backward_search (GtkSourceSearchContext *search, static void add_subregion_to_scan (GtkSourceSearchContext *search, - const GtkTextIter *subregion_start, - const GtkTextIter *subregion_end) + const GtkTextIter *subregion_start, + const GtkTextIter *subregion_end) { GtkTextIter start = *subregion_start; GtkTextIter end = *subregion_end; - if (search->priv->scan_region == NULL) + if (search->scan_region == NULL) { - search->priv->scan_region = gtk_source_region_new (search->priv->buffer); + search->scan_region = gtk_source_region_new (search->buffer); } DEBUG ({ g_print ("add_subregion_to_scan(): region to scan, before:\n"); - print_region (search->priv->scan_region); + print_region (search->scan_region); }); - gtk_source_region_add_subregion (search->priv->scan_region, &start, &end); + gtk_source_region_add_subregion (search->scan_region, &start, &end); DEBUG ({ g_print ("add_subregion_to_scan(): region to scan, after:\n"); - print_region (search->priv->scan_region); + print_region (search->scan_region); }); install_idle_scan (search); @@ -2312,49 +2314,49 @@ static void update_regex (GtkSourceSearchContext *search) { gboolean regex_error_changed = FALSE; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); - if (search->priv->regex != NULL) + if (search->regex != NULL) { - g_regex_unref (search->priv->regex); - search->priv->regex = NULL; + g_regex_unref (search->regex); + search->regex = NULL; } - if (search->priv->regex_error != NULL) + if (search->regex_error != NULL) { - g_clear_error (&search->priv->regex_error); + g_clear_error (&search->regex_error); regex_error_changed = TRUE; } if (search_text != NULL && - gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + gtk_source_search_settings_get_regex_enabled (search->settings)) { GRegexCompileFlags compile_flags = G_REGEX_OPTIMIZE | G_REGEX_MULTILINE; gchar *pattern = (gchar *)search_text; - search->priv->text_nb_lines = 0; + search->text_nb_lines = 0; - if (!gtk_source_search_settings_get_case_sensitive (search->priv->settings)) + if (!gtk_source_search_settings_get_case_sensitive (search->settings)) { compile_flags |= G_REGEX_CASELESS; } - if (gtk_source_search_settings_get_at_word_boundaries (search->priv->settings)) + if (gtk_source_search_settings_get_at_word_boundaries (search->settings)) { pattern = g_strdup_printf ("\\b%s\\b", search_text); } - search->priv->regex = g_regex_new (pattern, + search->regex = g_regex_new (pattern, compile_flags, G_REGEX_MATCH_NOTEMPTY, - &search->priv->regex_error); + &search->regex_error); - if (search->priv->regex_error != NULL) + if (search->regex_error != NULL) { regex_error_changed = TRUE; } - if (gtk_source_search_settings_get_at_word_boundaries (search->priv->settings)) + if (gtk_source_search_settings_get_at_word_boundaries (search->settings)) { g_free (pattern); } @@ -2373,7 +2375,7 @@ update (GtkSourceSearchContext *search) GtkTextIter end; GtkSourceBufferInternal *buffer_internal; - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return; } @@ -2381,31 +2383,31 @@ update (GtkSourceSearchContext *search) clear_search (search); update_regex (search); - search->priv->scan_region = gtk_source_region_new (search->priv->buffer); + search->scan_region = gtk_source_region_new (search->buffer); - gtk_text_buffer_get_bounds (search->priv->buffer, &start, &end); + gtk_text_buffer_get_bounds (search->buffer, &start, &end); add_subregion_to_scan (search, &start, &end); /* Notify the GtkSourceViews that the search is starting, so that * _gtk_source_search_context_update_highlight() can be called for the * visible regions of the buffer. */ - buffer_internal = _gtk_source_buffer_internal_get_from_buffer (GTK_SOURCE_BUFFER (search->priv->buffer)); + buffer_internal = _gtk_source_buffer_internal_get_from_buffer (GTK_SOURCE_BUFFER (search->buffer)); _gtk_source_buffer_internal_emit_search_start (buffer_internal, search); } static void insert_text_before_cb (GtkSourceSearchContext *search, - GtkTextIter *location, - gchar *text, - gint length) + GtkTextIter *location, + gchar *text, + gint length) { - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); clear_task (search); if (search_text != NULL && - !gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + !gtk_source_search_settings_get_regex_enabled (search->settings)) { GtkTextIter start = *location; GtkTextIter end = *location; @@ -2417,11 +2419,11 @@ insert_text_before_cb (GtkSourceSearchContext *search, static void insert_text_after_cb (GtkSourceSearchContext *search, - GtkTextIter *location, - gchar *text, - gint length) + GtkTextIter *location, + gchar *text, + gint length) { - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { update (search); } @@ -2441,27 +2443,27 @@ insert_text_after_cb (GtkSourceSearchContext *search, static void delete_range_before_cb (GtkSourceSearchContext *search, - GtkTextIter *delete_start, - GtkTextIter *delete_end) + GtkTextIter *delete_start, + GtkTextIter *delete_end) { GtkTextIter start_buffer; GtkTextIter end_buffer; - const gchar *search_text = gtk_source_search_settings_get_search_text (search->priv->settings); + const gchar *search_text = gtk_source_search_settings_get_search_text (search->settings); clear_task (search); - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { return; } - gtk_text_buffer_get_bounds (search->priv->buffer, &start_buffer, &end_buffer); + gtk_text_buffer_get_bounds (search->buffer, &start_buffer, &end_buffer); if (gtk_text_iter_equal (delete_start, &start_buffer) && gtk_text_iter_equal (delete_end, &end_buffer)) { /* Special case when removing all the text. */ - search->priv->occurrences_count = 0; + search->occurrences_count = 0; return; } @@ -2470,8 +2472,8 @@ delete_range_before_cb (GtkSourceSearchContext *search, GtkTextIter start = *delete_start; GtkTextIter end = *delete_end; - gtk_text_iter_backward_lines (&start, search->priv->text_nb_lines); - gtk_text_iter_forward_lines (&end, search->priv->text_nb_lines); + gtk_text_iter_backward_lines (&start, search->text_nb_lines); + gtk_text_iter_forward_lines (&end, search->text_nb_lines); remove_occurrences_in_range (search, &start, &end); add_subregion_to_scan (search, &start, &end); @@ -2480,10 +2482,10 @@ delete_range_before_cb (GtkSourceSearchContext *search, static void delete_range_after_cb (GtkSourceSearchContext *search, - GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *start, + GtkTextIter *end) { - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { update (search); } @@ -2497,16 +2499,16 @@ static void set_buffer (GtkSourceSearchContext *search, GtkSourceBuffer *buffer) { - g_assert (search->priv->buffer == NULL); - g_assert (search->priv->tag_table == NULL); + g_assert (search->buffer == NULL); + g_assert (search->tag_table == NULL); - search->priv->buffer = GTK_TEXT_BUFFER (buffer); + search->buffer = GTK_TEXT_BUFFER (buffer); g_object_add_weak_pointer (G_OBJECT (buffer), - (gpointer *)&search->priv->buffer); + (gpointer *)&search->buffer); - search->priv->tag_table = gtk_text_buffer_get_tag_table (search->priv->buffer); - g_object_ref (search->priv->tag_table); + search->tag_table = gtk_text_buffer_get_tag_table (search->buffer); + g_object_ref (search->tag_table); g_signal_connect_object (buffer, "insert-text", @@ -2532,12 +2534,12 @@ set_buffer (GtkSourceSearchContext *search, search, G_CONNECT_AFTER | G_CONNECT_SWAPPED); - search->priv->found_tag = gtk_text_buffer_create_tag (search->priv->buffer, NULL, NULL); - g_object_ref (search->priv->found_tag); + search->found_tag = gtk_text_buffer_create_tag (search->buffer, NULL, NULL); + g_object_ref (search->found_tag); sync_found_tag (search); - g_signal_connect_object (search->priv->buffer, + g_signal_connect_object (search->buffer, "notify::style-scheme", G_CALLBACK (sync_found_tag), search, @@ -2585,21 +2587,21 @@ compute_number_of_lines (const gchar *text) static void search_text_updated (GtkSourceSearchContext *search) { - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { - search->priv->text_nb_lines = 0; + search->text_nb_lines = 0; } else { - const gchar *text = gtk_source_search_settings_get_search_text (search->priv->settings); - search->priv->text_nb_lines = compute_number_of_lines (text); + const gchar *text = gtk_source_search_settings_get_search_text (search->settings); + search->text_nb_lines = compute_number_of_lines (text); } } static void settings_notify_cb (GtkSourceSearchContext *search, - GParamSpec *pspec, - GtkSourceSearchSettings *settings) + GParamSpec *pspec, + GtkSourceSearchSettings *settings) { const gchar *property = g_param_spec_get_name (pspec); @@ -2613,20 +2615,20 @@ settings_notify_cb (GtkSourceSearchContext *search, static void set_settings (GtkSourceSearchContext *search, - GtkSourceSearchSettings *settings) + GtkSourceSearchSettings *settings) { - g_assert (search->priv->settings == NULL); + g_assert (search->settings == NULL); if (settings != NULL) { - search->priv->settings = g_object_ref (settings); + search->settings = g_object_ref (settings); } else { - search->priv->settings = gtk_source_search_settings_new (); + search->settings = gtk_source_search_settings_new (); } - g_signal_connect_object (search->priv->settings, + g_signal_connect_object (search->settings, "notify", G_CALLBACK (settings_notify_cb), search, @@ -2645,25 +2647,25 @@ gtk_source_search_context_dispose (GObject *object) clear_search (search); - if (search->priv->found_tag != NULL && - search->priv->tag_table != NULL) + if (search->found_tag != NULL && + search->tag_table != NULL) { - gtk_text_tag_table_remove (search->priv->tag_table, - search->priv->found_tag); + gtk_text_tag_table_remove (search->tag_table, + search->found_tag); - g_clear_object (&search->priv->found_tag); - g_clear_object (&search->priv->tag_table); + g_clear_object (&search->found_tag); + g_clear_object (&search->tag_table); } - if (search->priv->buffer != NULL) + if (search->buffer != NULL) { - g_object_remove_weak_pointer (G_OBJECT (search->priv->buffer), - (gpointer *)&search->priv->buffer); + g_object_remove_weak_pointer (G_OBJECT (search->buffer), + (gpointer *)&search->buffer); - search->priv->buffer = NULL; + search->buffer = NULL; } - g_clear_object (&search->priv->settings); + g_clear_object (&search->settings); G_OBJECT_CLASS (gtk_source_search_context_parent_class)->dispose (object); } @@ -2673,21 +2675,21 @@ gtk_source_search_context_finalize (GObject *object) { GtkSourceSearchContext *search = GTK_SOURCE_SEARCH_CONTEXT (object); - if (search->priv->regex != NULL) + if (search->regex != NULL) { - g_regex_unref (search->priv->regex); + g_regex_unref (search->regex); } - g_clear_error (&search->priv->regex_error); + g_clear_error (&search->regex_error); G_OBJECT_CLASS (gtk_source_search_context_parent_class)->finalize (object); } static void gtk_source_search_context_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceSearchContext *search; @@ -2698,19 +2700,19 @@ gtk_source_search_context_get_property (GObject *object, switch (prop_id) { case PROP_BUFFER: - g_value_set_object (value, search->priv->buffer); + g_value_set_object (value, search->buffer); break; case PROP_SETTINGS: - g_value_set_object (value, search->priv->settings); + g_value_set_object (value, search->settings); break; case PROP_HIGHLIGHT: - g_value_set_boolean (value, search->priv->highlight); + g_value_set_boolean (value, search->highlight); break; case PROP_MATCH_STYLE: - g_value_set_object (value, search->priv->match_style); + g_value_set_object (value, search->match_style); break; case PROP_OCCURRENCES_COUNT: @@ -2729,9 +2731,9 @@ gtk_source_search_context_get_property (GObject *object, static void gtk_source_search_context_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceSearchContext *search; @@ -2886,7 +2888,7 @@ gtk_source_search_context_class_init (GtkSourceSearchContextClass *klass) static void gtk_source_search_context_init (GtkSourceSearchContext *search) { - search->priv = gtk_source_search_context_get_instance_private (search); + search = gtk_source_search_context_get_instance_private (search); } /** @@ -2904,7 +2906,7 @@ gtk_source_search_context_init (GtkSourceSearchContext *search) */ GtkSourceSearchContext * gtk_source_search_context_new (GtkSourceBuffer *buffer, - GtkSourceSearchSettings *settings) + GtkSourceSearchSettings *settings) { g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL); g_return_val_if_fail (settings == NULL || GTK_SOURCE_IS_SEARCH_SETTINGS (settings), NULL); @@ -2927,7 +2929,7 @@ gtk_source_search_context_get_buffer (GtkSourceSearchContext *search) { g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search), NULL); - return GTK_SOURCE_BUFFER (search->priv->buffer); + return GTK_SOURCE_BUFFER (search->buffer); } /** @@ -2942,7 +2944,7 @@ gtk_source_search_context_get_settings (GtkSourceSearchContext *search) { g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search), NULL); - return search->priv->settings; + return search->settings; } /** @@ -2957,7 +2959,7 @@ gtk_source_search_context_get_highlight (GtkSourceSearchContext *search) { g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search), FALSE); - return search->priv->highlight; + return search->highlight; } /** @@ -2971,15 +2973,15 @@ gtk_source_search_context_get_highlight (GtkSourceSearchContext *search) */ void gtk_source_search_context_set_highlight (GtkSourceSearchContext *search, - gboolean highlight) + gboolean highlight) { g_return_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search)); highlight = highlight != FALSE; - if (search->priv->highlight != highlight) + if (search->highlight != highlight) { - search->priv->highlight = highlight; + search->highlight = highlight; sync_found_tag (search); g_object_notify (G_OBJECT (search), "highlight"); @@ -2999,7 +3001,7 @@ gtk_source_search_context_get_match_style (GtkSourceSearchContext *search) { g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search), NULL); - return search->priv->match_style; + return search->match_style; } /** @@ -3016,22 +3018,22 @@ gtk_source_search_context_get_match_style (GtkSourceSearchContext *search) */ void gtk_source_search_context_set_match_style (GtkSourceSearchContext *search, - GtkSourceStyle *match_style) + GtkSourceStyle *match_style) { g_return_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search)); g_return_if_fail (match_style == NULL || GTK_SOURCE_IS_STYLE (match_style)); - if (search->priv->match_style == match_style) + if (search->match_style == match_style) { return; } - if (search->priv->match_style != NULL) + if (search->match_style != NULL) { - g_object_unref (search->priv->match_style); + g_object_unref (search->match_style); } - search->priv->match_style = match_style; + search->match_style = match_style; if (match_style != NULL) { @@ -3059,12 +3061,12 @@ gtk_source_search_context_get_regex_error (GtkSourceSearchContext *search) { g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search), NULL); - if (search->priv->regex_error == NULL) + if (search->regex_error == NULL) { return NULL; } - return g_error_copy (search->priv->regex_error); + return g_error_copy (search->regex_error); } /** @@ -3083,12 +3085,12 @@ gtk_source_search_context_get_occurrences_count (GtkSourceSearchContext *search) { g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search), -1); - if (!gtk_source_region_is_empty (search->priv->scan_region)) + if (!gtk_source_region_is_empty (search->scan_region)) { return -1; } - return search->priv->occurrences_count; + return search->occurrences_count; } /** @@ -3110,8 +3112,8 @@ gtk_source_search_context_get_occurrences_count (GtkSourceSearchContext *search) */ gint gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *search, - const GtkTextIter *match_start, - const GtkTextIter *match_end) + const GtkTextIter *match_start, + const GtkTextIter *match_end) { GtkTextIter m_start; GtkTextIter m_end; @@ -3125,16 +3127,16 @@ gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *searc g_return_val_if_fail (match_start != NULL, -1); g_return_val_if_fail (match_end != NULL, -1); - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return -1; } /* Verify that the [match_start; match_end] region has been scanned. */ - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, match_start, match_end); @@ -3167,11 +3169,11 @@ gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *searc * and the end of the occurrence. */ - gtk_text_buffer_get_start_iter (search->priv->buffer, &iter); + gtk_text_buffer_get_start_iter (search->buffer, &iter); - if (search->priv->scan_region != NULL) + if (search->scan_region != NULL) { - region = gtk_source_region_intersect_subregion (search->priv->scan_region, + region = gtk_source_region_intersect_subregion (search->scan_region, &iter, match_end); @@ -3221,10 +3223,10 @@ gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *searc */ gboolean gtk_source_search_context_forward (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around) + const GtkTextIter *iter, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around) { GtkTextIter m_start; GtkTextIter m_end; @@ -3238,17 +3240,17 @@ gtk_source_search_context_forward (GtkSourceSearchContext *search, *has_wrapped_around = FALSE; } - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return FALSE; } found = smart_forward_search (search, iter, &m_start, &m_end); - if (!found && gtk_source_search_settings_get_wrap_around (search->priv->settings)) + if (!found && gtk_source_search_settings_get_wrap_around (search->settings)) { GtkTextIter start_iter; - gtk_text_buffer_get_start_iter (search->priv->buffer, &start_iter); + gtk_text_buffer_get_start_iter (search->buffer, &start_iter); found = smart_forward_search (search, &start_iter, &m_start, &m_end); @@ -3294,21 +3296,21 @@ gtk_source_search_context_forward (GtkSourceSearchContext *search, */ void gtk_source_search_context_forward_async (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) + const GtkTextIter *iter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { g_return_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search)); g_return_if_fail (iter != NULL); - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return; } clear_task (search); - search->priv->task = g_task_new (search, cancellable, callback, user_data); + search->task = g_task_new (search, cancellable, callback, user_data); smart_forward_search_async (search, iter, FALSE); } @@ -3334,11 +3336,11 @@ gtk_source_search_context_forward_async (GtkSourceSearchContext *search, */ gboolean gtk_source_search_context_forward_finish (GtkSourceSearchContext *search, - GAsyncResult *result, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around, - GError **error) + GAsyncResult *result, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around, + GError **error) { ForwardBackwardData *data; gboolean found; @@ -3350,7 +3352,7 @@ gtk_source_search_context_forward_finish (GtkSourceSearchContext *search, *has_wrapped_around = FALSE; } - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return FALSE; } @@ -3370,14 +3372,14 @@ gtk_source_search_context_forward_finish (GtkSourceSearchContext *search, { if (match_start != NULL) { - gtk_text_buffer_get_iter_at_mark (search->priv->buffer, + gtk_text_buffer_get_iter_at_mark (search->buffer, match_start, data->match_start); } if (match_end != NULL) { - gtk_text_buffer_get_iter_at_mark (search->priv->buffer, + gtk_text_buffer_get_iter_at_mark (search->buffer, match_end, data->match_end); } @@ -3417,10 +3419,10 @@ gtk_source_search_context_forward_finish (GtkSourceSearchContext *search, */ gboolean gtk_source_search_context_backward (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around) + const GtkTextIter *iter, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around) { GtkTextIter m_start; GtkTextIter m_end; @@ -3434,18 +3436,18 @@ gtk_source_search_context_backward (GtkSourceSearchContext *search, *has_wrapped_around = FALSE; } - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return FALSE; } found = smart_backward_search (search, iter, &m_start, &m_end); - if (!found && gtk_source_search_settings_get_wrap_around (search->priv->settings)) + if (!found && gtk_source_search_settings_get_wrap_around (search->settings)) { GtkTextIter end_iter; - gtk_text_buffer_get_end_iter (search->priv->buffer, &end_iter); + gtk_text_buffer_get_end_iter (search->buffer, &end_iter); found = smart_backward_search (search, &end_iter, &m_start, &m_end); @@ -3491,21 +3493,21 @@ gtk_source_search_context_backward (GtkSourceSearchContext *search, */ void gtk_source_search_context_backward_async (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) + const GtkTextIter *iter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { g_return_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search)); g_return_if_fail (iter != NULL); - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return; } clear_task (search); - search->priv->task = g_task_new (search, cancellable, callback, user_data); + search->task = g_task_new (search, cancellable, callback, user_data); smart_backward_search_async (search, iter, FALSE); } @@ -3531,11 +3533,11 @@ gtk_source_search_context_backward_async (GtkSourceSearchContext *search, */ gboolean gtk_source_search_context_backward_finish (GtkSourceSearchContext *search, - GAsyncResult *result, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around, - GError **error) + GAsyncResult *result, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around, + GError **error) { return gtk_source_search_context_forward_finish (search, result, @@ -3568,8 +3570,8 @@ regex_replace (GtkSourceSearchContext *search, GError *tmp_error = NULL; gboolean replaced = FALSE; - if (search->priv->regex == NULL || - search->priv->regex_error != NULL) + if (search->regex == NULL || + search->regex_error != NULL) { return FALSE; } @@ -3601,7 +3603,7 @@ regex_replace (GtkSourceSearchContext *search, match_options = regex_search_get_match_options (&real_start, &real_end); match_options |= G_REGEX_MATCH_ANCHORED; - subject_replaced = g_regex_replace (search->priv->regex, + subject_replaced = g_regex_replace (search->regex, subject, -1, start_pos, @@ -3628,10 +3630,10 @@ regex_replace (GtkSourceSearchContext *search, match_start_copy = *match_start; - gtk_text_buffer_begin_user_action (search->priv->buffer); - gtk_text_buffer_delete (search->priv->buffer, &match_start_copy, match_end); - gtk_text_buffer_insert (search->priv->buffer, match_end, subject_replaced + start_pos, -1); - gtk_text_buffer_end_user_action (search->priv->buffer); + gtk_text_buffer_begin_user_action (search->buffer); + gtk_text_buffer_delete (search->buffer, &match_start_copy, match_end); + gtk_text_buffer_insert (search->buffer, match_end, subject_replaced + start_pos, -1); + gtk_text_buffer_end_user_action (search->buffer); replaced = TRUE; @@ -3666,11 +3668,11 @@ end: */ gboolean gtk_source_search_context_replace (GtkSourceSearchContext *search, - GtkTextIter *match_start, - GtkTextIter *match_end, - const gchar *replace, - gint replace_length, - GError **error) + GtkTextIter *match_start, + GtkTextIter *match_end, + const gchar *replace, + gint replace_length, + GError **error) { GtkTextIter start; GtkTextIter end; @@ -3683,7 +3685,7 @@ gtk_source_search_context_replace (GtkSourceSearchContext *search, g_return_val_if_fail (replace != NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return FALSE; } @@ -3699,29 +3701,29 @@ gtk_source_search_context_replace (GtkSourceSearchContext *search, return FALSE; } - start_mark = gtk_text_buffer_create_mark (search->priv->buffer, NULL, &start, TRUE); + start_mark = gtk_text_buffer_create_mark (search->buffer, NULL, &start, TRUE); - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { replaced = regex_replace (search, &start, &end, replace, error); } else { - gtk_text_buffer_begin_user_action (search->priv->buffer); - gtk_text_buffer_delete (search->priv->buffer, &start, &end); - gtk_text_buffer_insert (search->priv->buffer, &end, replace, replace_length); - gtk_text_buffer_end_user_action (search->priv->buffer); + gtk_text_buffer_begin_user_action (search->buffer); + gtk_text_buffer_delete (search->buffer, &start, &end); + gtk_text_buffer_insert (search->buffer, &end, replace, replace_length); + gtk_text_buffer_end_user_action (search->buffer); replaced = TRUE; } if (replaced) { - gtk_text_buffer_get_iter_at_mark (search->priv->buffer, match_start, start_mark); + gtk_text_buffer_get_iter_at_mark (search->buffer, match_start, start_mark); *match_end = end; } - gtk_text_buffer_delete_mark (search->priv->buffer, start_mark); + gtk_text_buffer_delete_mark (search->buffer, start_mark); return replaced; } @@ -3745,9 +3747,9 @@ gtk_source_search_context_replace (GtkSourceSearchContext *search, */ guint gtk_source_search_context_replace_all (GtkSourceSearchContext *search, - const gchar *replace, - gint replace_length, - GError **error) + const gchar *replace, + gint replace_length, + GError **error) { GtkTextIter iter; GtkTextIter match_start; @@ -3760,17 +3762,17 @@ gtk_source_search_context_replace_all (GtkSourceSearchContext *search, g_return_val_if_fail (replace != NULL, 0); g_return_val_if_fail (error == NULL || *error == NULL, 0); - if (search->priv->buffer == NULL) + if (search->buffer == NULL) { return 0; } - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { GError *tmp_error = NULL; - if (search->priv->regex == NULL || - search->priv->regex_error != NULL) + if (search->regex == NULL || + search->regex_error != NULL) { return 0; } @@ -3786,22 +3788,22 @@ gtk_source_search_context_replace_all (GtkSourceSearchContext *search, } } - g_signal_handlers_block_by_func (search->priv->buffer, insert_text_before_cb, search); - g_signal_handlers_block_by_func (search->priv->buffer, insert_text_after_cb, search); - g_signal_handlers_block_by_func (search->priv->buffer, delete_range_before_cb, search); - g_signal_handlers_block_by_func (search->priv->buffer, delete_range_after_cb, search); + g_signal_handlers_block_by_func (search->buffer, insert_text_before_cb, search); + g_signal_handlers_block_by_func (search->buffer, insert_text_after_cb, search); + g_signal_handlers_block_by_func (search->buffer, delete_range_before_cb, search); + g_signal_handlers_block_by_func (search->buffer, delete_range_after_cb, search); highlight_matching_brackets = - gtk_source_buffer_get_highlight_matching_brackets (GTK_SOURCE_BUFFER (search->priv->buffer)); + gtk_source_buffer_get_highlight_matching_brackets (GTK_SOURCE_BUFFER (search->buffer)); - gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (search->priv->buffer), + gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (search->buffer), FALSE); - _gtk_source_buffer_save_and_clear_selection (GTK_SOURCE_BUFFER (search->priv->buffer)); + _gtk_source_buffer_save_and_clear_selection (GTK_SOURCE_BUFFER (search->buffer)); - gtk_text_buffer_get_start_iter (search->priv->buffer, &iter); + gtk_text_buffer_get_start_iter (search->buffer, &iter); - gtk_text_buffer_begin_user_action (search->priv->buffer); + gtk_text_buffer_begin_user_action (search->buffer); while (smart_forward_search (search, &iter, &match_start, &match_end)) { @@ -3814,25 +3816,25 @@ gtk_source_search_context_replace_all (GtkSourceSearchContext *search, } else { - gtk_text_buffer_delete (search->priv->buffer, &match_start, &match_end); - gtk_text_buffer_insert (search->priv->buffer, &match_end, replace, replace_length); + gtk_text_buffer_delete (search->buffer, &match_start, &match_end); + gtk_text_buffer_insert (search->buffer, &match_end, replace, replace_length); } nb_matches_replaced++; iter = match_end; } - gtk_text_buffer_end_user_action (search->priv->buffer); + gtk_text_buffer_end_user_action (search->buffer); - _gtk_source_buffer_restore_selection (GTK_SOURCE_BUFFER (search->priv->buffer)); + _gtk_source_buffer_restore_selection (GTK_SOURCE_BUFFER (search->buffer)); - gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (search->priv->buffer), + gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (search->buffer), highlight_matching_brackets); - g_signal_handlers_unblock_by_func (search->priv->buffer, insert_text_before_cb, search); - g_signal_handlers_unblock_by_func (search->priv->buffer, insert_text_after_cb, search); - g_signal_handlers_unblock_by_func (search->priv->buffer, delete_range_before_cb, search); - g_signal_handlers_unblock_by_func (search->priv->buffer, delete_range_after_cb, search); + g_signal_handlers_unblock_by_func (search->buffer, insert_text_before_cb, search); + g_signal_handlers_unblock_by_func (search->buffer, insert_text_after_cb, search); + g_signal_handlers_unblock_by_func (search->buffer, delete_range_before_cb, search); + g_signal_handlers_unblock_by_func (search->buffer, delete_range_after_cb, search); update (search); @@ -3842,9 +3844,9 @@ gtk_source_search_context_replace_all (GtkSourceSearchContext *search, /* Highlight the [start,end] region in priority. */ void _gtk_source_search_context_update_highlight (GtkSourceSearchContext *search, - const GtkTextIter *start, - const GtkTextIter *end, - gboolean synchronous) + const GtkTextIter *start, + const GtkTextIter *end, + gboolean synchronous) { GtkSourceRegion *region_to_highlight = NULL; @@ -3852,14 +3854,14 @@ _gtk_source_search_context_update_highlight (GtkSourceSearchContext *search, g_return_if_fail (start != NULL); g_return_if_fail (end != NULL); - if (search->priv->buffer == NULL || - gtk_source_region_is_empty (search->priv->scan_region) || - !search->priv->highlight) + if (search->buffer == NULL || + gtk_source_region_is_empty (search->scan_region) || + !search->highlight) { return; } - region_to_highlight = gtk_source_region_intersect_subregion (search->priv->scan_region, + region_to_highlight = gtk_source_region_intersect_subregion (search->scan_region, start, end); @@ -3870,14 +3872,14 @@ _gtk_source_search_context_update_highlight (GtkSourceSearchContext *search, if (!synchronous) { - if (search->priv->high_priority_region == NULL) + if (search->high_priority_region == NULL) { - search->priv->high_priority_region = region_to_highlight; + search->high_priority_region = region_to_highlight; region_to_highlight = NULL; } else { - gtk_source_region_add_region (search->priv->high_priority_region, + gtk_source_region_add_region (search->high_priority_region, region_to_highlight); } @@ -3885,11 +3887,11 @@ _gtk_source_search_context_update_highlight (GtkSourceSearchContext *search, goto out; } - if (gtk_source_search_settings_get_regex_enabled (search->priv->settings)) + if (gtk_source_search_settings_get_regex_enabled (search->settings)) { GtkTextIter region_start; - if (!gtk_source_region_get_bounds (search->priv->scan_region, + if (!gtk_source_region_get_bounds (search->scan_region, ®ion_start, NULL)) { diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtksourcesearchcontext.h index b0749f42..337dcd11 100644 --- a/gtksourceview/gtksourcesearchcontext.h +++ b/gtksourceview/gtksourcesearchcontext.h @@ -29,130 +29,90 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_SEARCH_CONTEXT (gtk_source_search_context_get_type ()) -#define GTK_SOURCE_SEARCH_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_SEARCH_CONTEXT, GtkSourceSearchContext)) -#define GTK_SOURCE_SEARCH_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_SEARCH_CONTEXT, GtkSourceSearchContextClass)) -#define GTK_SOURCE_IS_SEARCH_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_SEARCH_CONTEXT)) -#define GTK_SOURCE_IS_SEARCH_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_SEARCH_CONTEXT)) -#define GTK_SOURCE_SEARCH_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_SEARCH_CONTEXT, GtkSourceSearchContextClass)) - -typedef struct _GtkSourceSearchContextClass GtkSourceSearchContextClass; -typedef struct _GtkSourceSearchContextPrivate GtkSourceSearchContextPrivate; - -struct _GtkSourceSearchContext -{ - GObject parent; - - GtkSourceSearchContextPrivate *priv; -}; - -struct _GtkSourceSearchContextClass -{ - GObjectClass parent_class; - - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_SEARCH_CONTEXT (gtk_source_search_context_get_type()) GTK_SOURCE_AVAILABLE_IN_3_10 -GType gtk_source_search_context_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceSearchContext, gtk_source_search_context, GTK_SOURCE, SEARCH_CONTEXT, GObject) GTK_SOURCE_AVAILABLE_IN_3_10 -GtkSourceSearchContext *gtk_source_search_context_new (GtkSourceBuffer *buffer, - GtkSourceSearchSettings *settings); - +GtkSourceSearchContext *gtk_source_search_context_new (GtkSourceBuffer *buffer, + GtkSourceSearchSettings *settings); GTK_SOURCE_AVAILABLE_IN_3_10 -GtkSourceBuffer *gtk_source_search_context_get_buffer (GtkSourceSearchContext *search); - +GtkSourceBuffer *gtk_source_search_context_get_buffer (GtkSourceSearchContext *search); GTK_SOURCE_AVAILABLE_IN_3_10 -GtkSourceSearchSettings *gtk_source_search_context_get_settings (GtkSourceSearchContext *search); - +GtkSourceSearchSettings *gtk_source_search_context_get_settings (GtkSourceSearchContext *search); GTK_SOURCE_AVAILABLE_IN_3_10 -gboolean gtk_source_search_context_get_highlight (GtkSourceSearchContext *search); - +gboolean gtk_source_search_context_get_highlight (GtkSourceSearchContext *search); GTK_SOURCE_AVAILABLE_IN_3_10 -void gtk_source_search_context_set_highlight (GtkSourceSearchContext *search, - gboolean highlight); - +void gtk_source_search_context_set_highlight (GtkSourceSearchContext *search, + gboolean highlight); GTK_SOURCE_AVAILABLE_IN_3_16 -GtkSourceStyle *gtk_source_search_context_get_match_style (GtkSourceSearchContext *search); - +GtkSourceStyle *gtk_source_search_context_get_match_style (GtkSourceSearchContext *search); GTK_SOURCE_AVAILABLE_IN_3_16 -void gtk_source_search_context_set_match_style (GtkSourceSearchContext *search, - GtkSourceStyle *match_style); - +void gtk_source_search_context_set_match_style (GtkSourceSearchContext *search, + GtkSourceStyle *match_style); GTK_SOURCE_AVAILABLE_IN_3_10 -GError *gtk_source_search_context_get_regex_error (GtkSourceSearchContext *search); - +GError *gtk_source_search_context_get_regex_error (GtkSourceSearchContext *search); GTK_SOURCE_AVAILABLE_IN_3_10 -gint gtk_source_search_context_get_occurrences_count (GtkSourceSearchContext *search); - +gint gtk_source_search_context_get_occurrences_count (GtkSourceSearchContext *search); GTK_SOURCE_AVAILABLE_IN_3_10 -gint gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *search, - const GtkTextIter *match_start, - const GtkTextIter *match_end); - +gint gtk_source_search_context_get_occurrence_position (GtkSourceSearchContext *search, + const GtkTextIter *match_start, + const GtkTextIter *match_end); GTK_SOURCE_AVAILABLE_IN_4_0 -gboolean gtk_source_search_context_forward (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around); - +gboolean gtk_source_search_context_forward (GtkSourceSearchContext *search, + const GtkTextIter *iter, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around); GTK_SOURCE_AVAILABLE_IN_3_10 -void gtk_source_search_context_forward_async (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - +void gtk_source_search_context_forward_async (GtkSourceSearchContext *search, + const GtkTextIter *iter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); GTK_SOURCE_AVAILABLE_IN_4_0 -gboolean gtk_source_search_context_forward_finish (GtkSourceSearchContext *search, - GAsyncResult *result, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around, - GError **error); - +gboolean gtk_source_search_context_forward_finish (GtkSourceSearchContext *search, + GAsyncResult *result, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around, + GError **error); GTK_SOURCE_AVAILABLE_IN_4_0 -gboolean gtk_source_search_context_backward (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around); - +gboolean gtk_source_search_context_backward (GtkSourceSearchContext *search, + const GtkTextIter *iter, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around); GTK_SOURCE_AVAILABLE_IN_3_10 -void gtk_source_search_context_backward_async (GtkSourceSearchContext *search, - const GtkTextIter *iter, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - +void gtk_source_search_context_backward_async (GtkSourceSearchContext *search, + const GtkTextIter *iter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); GTK_SOURCE_AVAILABLE_IN_4_0 -gboolean gtk_source_search_context_backward_finish (GtkSourceSearchContext *search, - GAsyncResult *result, - GtkTextIter *match_start, - GtkTextIter *match_end, - gboolean *has_wrapped_around, - GError **error); - +gboolean gtk_source_search_context_backward_finish (GtkSourceSearchContext *search, + GAsyncResult *result, + GtkTextIter *match_start, + GtkTextIter *match_end, + gboolean *has_wrapped_around, + GError **error); GTK_SOURCE_AVAILABLE_IN_4_0 -gboolean gtk_source_search_context_replace (GtkSourceSearchContext *search, - GtkTextIter *match_start, - GtkTextIter *match_end, - const gchar *replace, - gint replace_length, - GError **error); - +gboolean gtk_source_search_context_replace (GtkSourceSearchContext *search, + GtkTextIter *match_start, + GtkTextIter *match_end, + const gchar *replace, + gint replace_length, + GError **error); GTK_SOURCE_AVAILABLE_IN_3_10 -guint gtk_source_search_context_replace_all (GtkSourceSearchContext *search, - const gchar *replace, - gint replace_length, - GError **error); - +guint gtk_source_search_context_replace_all (GtkSourceSearchContext *search, + const gchar *replace, + gint replace_length, + GError **error); G_GNUC_INTERNAL -void _gtk_source_search_context_update_highlight (GtkSourceSearchContext *search, - const GtkTextIter *start, - const GtkTextIter *end, - gboolean synchronous); +void _gtk_source_search_context_update_highlight (GtkSourceSearchContext *search, + const GtkTextIter *start, + const GtkTextIter *end, + gboolean synchronous); G_END_DECLS -- GitLab From ab6e7c04f6339c2ef7e2e682f8abd6cd555fce4c Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:19:47 -0800 Subject: [PATCH 028/248] search: modernize GtkSourceSearchSettings - Use G_DECLARE_ macros - Fix multi-line function indentation - Use g_object_notify_by_pspec() --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcesearchsettings.c | 210 ++++++++++++------------ gtksourceview/gtksourcesearchsettings.h | 66 +++----- 3 files changed, 128 insertions(+), 149 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 331c68f1..c93ca5ef 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSearchSettings, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSpaceDrawer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserButton, g_object_unref) diff --git a/gtksourceview/gtksourcesearchsettings.c b/gtksourceview/gtksourcesearchsettings.c index 3834965b..d9cbbb34 100644 --- a/gtksourceview/gtksourcesearchsettings.c +++ b/gtksourceview/gtksourcesearchsettings.c @@ -40,62 +40,63 @@ enum PROP_CASE_SENSITIVE, PROP_AT_WORD_BOUNDARIES, PROP_WRAP_AROUND, - PROP_REGEX_ENABLED + PROP_REGEX_ENABLED, + N_PROPS }; -struct _GtkSourceSearchSettingsPrivate +typedef struct { gchar *search_text; guint case_sensitive : 1; guint at_word_boundaries : 1; guint wrap_around : 1; guint regex_enabled : 1; -}; +} GtkSourceSearchSettingsPrivate; G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceSearchSettings, gtk_source_search_settings, G_TYPE_OBJECT) +static GParamSpec *properties[N_PROPS]; + static void gtk_source_search_settings_finalize (GObject *object) { GtkSourceSearchSettings *settings = GTK_SOURCE_SEARCH_SETTINGS (object); + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); - g_free (settings->priv->search_text); + g_free (priv->search_text); G_OBJECT_CLASS (gtk_source_search_settings_parent_class)->finalize (object); } static void gtk_source_search_settings_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { - GtkSourceSearchSettings *settings; - - g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (object)); - - settings = GTK_SOURCE_SEARCH_SETTINGS (object); + GtkSourceSearchSettings *settings = GTK_SOURCE_SEARCH_SETTINGS (object); + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); switch (prop_id) { case PROP_SEARCH_TEXT: - g_value_set_string (value, settings->priv->search_text); + g_value_set_string (value, priv->search_text); break; case PROP_CASE_SENSITIVE: - g_value_set_boolean (value, settings->priv->case_sensitive); + g_value_set_boolean (value, priv->case_sensitive); break; case PROP_AT_WORD_BOUNDARIES: - g_value_set_boolean (value, settings->priv->at_word_boundaries); + g_value_set_boolean (value, priv->at_word_boundaries); break; case PROP_WRAP_AROUND: - g_value_set_boolean (value, settings->priv->wrap_around); + g_value_set_boolean (value, priv->wrap_around); break; case PROP_REGEX_ENABLED: - g_value_set_boolean (value, settings->priv->regex_enabled); + g_value_set_boolean (value, priv->regex_enabled); break; default: @@ -106,15 +107,12 @@ gtk_source_search_settings_get_property (GObject *object, static void gtk_source_search_settings_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { - GtkSourceSearchSettings *settings; - - g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (object)); - - settings = GTK_SOURCE_SEARCH_SETTINGS (object); + GtkSourceSearchSettings *settings = GTK_SOURCE_SEARCH_SETTINGS (object); + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); switch (prop_id) { @@ -123,19 +121,19 @@ gtk_source_search_settings_set_property (GObject *object, break; case PROP_CASE_SENSITIVE: - settings->priv->case_sensitive = g_value_get_boolean (value); + priv->case_sensitive = g_value_get_boolean (value); break; case PROP_AT_WORD_BOUNDARIES: - settings->priv->at_word_boundaries = g_value_get_boolean (value); + priv->at_word_boundaries = g_value_get_boolean (value); break; case PROP_WRAP_AROUND: - settings->priv->wrap_around = g_value_get_boolean (value); + priv->wrap_around = g_value_get_boolean (value); break; case PROP_REGEX_ENABLED: - settings->priv->regex_enabled = g_value_get_boolean (value); + priv->regex_enabled = g_value_get_boolean (value); break; default: @@ -162,15 +160,12 @@ gtk_source_search_settings_class_init (GtkSourceSearchSettingsClass *klass) * * Since: 3.10 */ - g_object_class_install_property (object_class, - PROP_SEARCH_TEXT, - g_param_spec_string ("search-text", - "Search text", - "The text to search", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); + properties[PROP_SEARCH_TEXT] = + g_param_spec_string ("search-text", + "Search text", + "The text to search", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); /** * GtkSourceSearchSettings:case-sensitive: @@ -179,15 +174,12 @@ gtk_source_search_settings_class_init (GtkSourceSearchSettingsClass *klass) * * Since: 3.10 */ - g_object_class_install_property (object_class, - PROP_CASE_SENSITIVE, - g_param_spec_boolean ("case-sensitive", - "Case sensitive", - "Case sensitive", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); + properties[PROP_CASE_SENSITIVE] = + g_param_spec_boolean ("case-sensitive", + "Case sensitive", + "Case sensitive", + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); /** * GtkSourceSearchSettings:at-word-boundaries: @@ -197,15 +189,12 @@ gtk_source_search_settings_class_init (GtkSourceSearchSettingsClass *klass) * * Since: 3.10 */ - g_object_class_install_property (object_class, - PROP_AT_WORD_BOUNDARIES, - g_param_spec_boolean ("at-word-boundaries", - "At word boundaries", - "Search at word boundaries", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); + properties[PROP_AT_WORD_BOUNDARIES] = + g_param_spec_boolean ("at-word-boundaries", + "At word boundaries", + "Search at word boundaries", + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); /** * GtkSourceSearchSettings:wrap-around: @@ -216,15 +205,12 @@ gtk_source_search_settings_class_init (GtkSourceSearchSettingsClass *klass) * * Since: 3.10 */ - g_object_class_install_property (object_class, - PROP_WRAP_AROUND, - g_param_spec_boolean ("wrap-around", - "Wrap around", - "Wrap around", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); + properties[PROP_WRAP_AROUND] = + g_param_spec_boolean ("wrap-around", + "Wrap around", + "Wrap around", + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); /** * GtkSourceSearchSettings:regex-enabled: @@ -234,21 +220,19 @@ gtk_source_search_settings_class_init (GtkSourceSearchSettingsClass *klass) * * Since: 3.10 */ - g_object_class_install_property (object_class, - PROP_REGEX_ENABLED, - g_param_spec_boolean ("regex-enabled", - "Regex enabled", - "Whether to search by regular expression", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); + properties[PROP_REGEX_ENABLED] = + g_param_spec_boolean ("regex-enabled", + "Regex enabled", + "Whether to search by regular expression", + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties (object_class, N_PROPS, properties); } static void gtk_source_search_settings_init (GtkSourceSearchSettings *self) { - self->priv = gtk_source_search_settings_get_instance_private (self); } /** @@ -281,30 +265,32 @@ gtk_source_search_settings_new (void) */ void gtk_source_search_settings_set_search_text (GtkSourceSearchSettings *settings, - const gchar *search_text) + const gchar *search_text) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings)); g_return_if_fail (search_text == NULL || g_utf8_validate (search_text, -1, NULL)); - if ((settings->priv->search_text == NULL && + if ((priv->search_text == NULL && (search_text == NULL || search_text[0] == '\0')) || - g_strcmp0 (settings->priv->search_text, search_text) == 0) + g_strcmp0 (priv->search_text, search_text) == 0) { return; } - g_free (settings->priv->search_text); + g_free (priv->search_text); if (search_text == NULL || search_text[0] == '\0') { - settings->priv->search_text = NULL; + priv->search_text = NULL; } else { - settings->priv->search_text = g_strdup (search_text); + priv->search_text = g_strdup (search_text); } - g_object_notify (G_OBJECT (settings), "search-text"); + g_object_notify_by_pspec (G_OBJECT (settings), properties[PROP_SEARCH_TEXT]); } /** @@ -322,9 +308,11 @@ gtk_source_search_settings_set_search_text (GtkSourceSearchSettings *settings, const gchar * gtk_source_search_settings_get_search_text (GtkSourceSearchSettings *settings) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings), NULL); - return settings->priv->search_text; + return priv->search_text; } /** @@ -338,16 +326,18 @@ gtk_source_search_settings_get_search_text (GtkSourceSearchSettings *settings) */ void gtk_source_search_settings_set_case_sensitive (GtkSourceSearchSettings *settings, - gboolean case_sensitive) + gboolean case_sensitive) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings)); case_sensitive = case_sensitive != FALSE; - if (settings->priv->case_sensitive != case_sensitive) + if (priv->case_sensitive != case_sensitive) { - settings->priv->case_sensitive = case_sensitive; - g_object_notify (G_OBJECT (settings), "case-sensitive"); + priv->case_sensitive = case_sensitive; + g_object_notify_by_pspec (G_OBJECT (settings), properties[PROP_CASE_SENSITIVE]); } } @@ -361,9 +351,11 @@ gtk_source_search_settings_set_case_sensitive (GtkSourceSearchSettings *settings gboolean gtk_source_search_settings_get_case_sensitive (GtkSourceSearchSettings *settings) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings), FALSE); - return settings->priv->case_sensitive; + return priv->case_sensitive; } /** @@ -380,16 +372,18 @@ gtk_source_search_settings_get_case_sensitive (GtkSourceSearchSettings *settings */ void gtk_source_search_settings_set_at_word_boundaries (GtkSourceSearchSettings *settings, - gboolean at_word_boundaries) + gboolean at_word_boundaries) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings)); at_word_boundaries = at_word_boundaries != FALSE; - if (settings->priv->at_word_boundaries != at_word_boundaries) + if (priv->at_word_boundaries != at_word_boundaries) { - settings->priv->at_word_boundaries = at_word_boundaries; - g_object_notify (G_OBJECT (settings), "at-word-boundaries"); + priv->at_word_boundaries = at_word_boundaries; + g_object_notify_by_pspec (G_OBJECT (settings), properties[PROP_AT_WORD_BOUNDARIES]); } } @@ -403,9 +397,11 @@ gtk_source_search_settings_set_at_word_boundaries (GtkSourceSearchSettings *sett gboolean gtk_source_search_settings_get_at_word_boundaries (GtkSourceSearchSettings *settings) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings), FALSE); - return settings->priv->at_word_boundaries; + return priv->at_word_boundaries; } /** @@ -422,16 +418,18 @@ gtk_source_search_settings_get_at_word_boundaries (GtkSourceSearchSettings *sett */ void gtk_source_search_settings_set_wrap_around (GtkSourceSearchSettings *settings, - gboolean wrap_around) + gboolean wrap_around) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings)); wrap_around = wrap_around != FALSE; - if (settings->priv->wrap_around != wrap_around) + if (priv->wrap_around != wrap_around) { - settings->priv->wrap_around = wrap_around; - g_object_notify (G_OBJECT (settings), "wrap-around"); + priv->wrap_around = wrap_around; + g_object_notify_by_pspec (G_OBJECT (settings), properties[PROP_WRAP_AROUND]); } } @@ -445,9 +443,11 @@ gtk_source_search_settings_set_wrap_around (GtkSourceSearchSettings *settings, gboolean gtk_source_search_settings_get_wrap_around (GtkSourceSearchSettings *settings) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings), FALSE); - return settings->priv->wrap_around; + return priv->wrap_around; } /** @@ -467,16 +467,18 @@ gtk_source_search_settings_get_wrap_around (GtkSourceSearchSettings *settings) */ void gtk_source_search_settings_set_regex_enabled (GtkSourceSearchSettings *settings, - gboolean regex_enabled) + gboolean regex_enabled) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings)); regex_enabled = regex_enabled != FALSE; - if (settings->priv->regex_enabled != regex_enabled) + if (priv->regex_enabled != regex_enabled) { - settings->priv->regex_enabled = regex_enabled; - g_object_notify (G_OBJECT (settings), "regex-enabled"); + priv->regex_enabled = regex_enabled; + g_object_notify_by_pspec (G_OBJECT (settings), properties[PROP_REGEX_ENABLED]); } } @@ -490,7 +492,9 @@ gtk_source_search_settings_set_regex_enabled (GtkSourceSearchSettings *settings, gboolean gtk_source_search_settings_get_regex_enabled (GtkSourceSearchSettings *settings) { + GtkSourceSearchSettingsPrivate *priv = gtk_source_search_settings_get_instance_private (settings); + g_return_val_if_fail (GTK_SOURCE_IS_SEARCH_SETTINGS (settings), FALSE); - return settings->priv->regex_enabled; + return priv->regex_enabled; } diff --git a/gtksourceview/gtksourcesearchsettings.h b/gtksourceview/gtksourcesearchsettings.h index 5d1e23ac..628c8403 100644 --- a/gtksourceview/gtksourcesearchsettings.h +++ b/gtksourceview/gtksourcesearchsettings.h @@ -29,69 +29,45 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_SEARCH_SETTINGS (gtk_source_search_settings_get_type ()) -#define GTK_SOURCE_SEARCH_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_SEARCH_SETTINGS, GtkSourceSearchSettings)) -#define GTK_SOURCE_SEARCH_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_SEARCH_SETTINGS, GtkSourceSearchSettingsClass)) -#define GTK_SOURCE_IS_SEARCH_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_SEARCH_SETTINGS)) -#define GTK_SOURCE_IS_SEARCH_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_SEARCH_SETTINGS)) -#define GTK_SOURCE_SEARCH_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_SEARCH_SETTINGS, GtkSourceSearchSettingsClass)) +#define GTK_SOURCE_TYPE_SEARCH_SETTINGS (gtk_source_search_settings_get_type()) -typedef struct _GtkSourceSearchSettingsClass GtkSourceSearchSettingsClass; -typedef struct _GtkSourceSearchSettingsPrivate GtkSourceSearchSettingsPrivate; - -struct _GtkSourceSearchSettings -{ - GObject parent; - - GtkSourceSearchSettingsPrivate *priv; -}; +GTK_SOURCE_AVAILABLE_IN_ALL +G_DECLARE_DERIVABLE_TYPE (GtkSourceSearchSettings, gtk_source_search_settings, GTK_SOURCE, SEARCH_SETTINGS, GObject) struct _GtkSourceSearchSettingsClass { GObjectClass parent_class; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_search_settings_get_type (void) G_GNUC_CONST; - +GtkSourceSearchSettings *gtk_source_search_settings_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceSearchSettings *gtk_source_search_settings_new (void); - +void gtk_source_search_settings_set_search_text (GtkSourceSearchSettings *settings, + const gchar *search_text); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_search_settings_set_search_text (GtkSourceSearchSettings *settings, - const gchar *search_text); - +const gchar *gtk_source_search_settings_get_search_text (GtkSourceSearchSettings *settings); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_search_settings_get_search_text (GtkSourceSearchSettings *settings); - +void gtk_source_search_settings_set_case_sensitive (GtkSourceSearchSettings *settings, + gboolean case_sensitive); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_search_settings_set_case_sensitive (GtkSourceSearchSettings *settings, - gboolean case_sensitive); - -GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_search_settings_get_case_sensitive (GtkSourceSearchSettings *settings); - +gboolean gtk_source_search_settings_get_case_sensitive (GtkSourceSearchSettings *settings); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_search_settings_set_at_word_boundaries (GtkSourceSearchSettings *settings, - gboolean at_word_boundaries); - +void gtk_source_search_settings_set_at_word_boundaries (GtkSourceSearchSettings *settings, + gboolean at_word_boundaries); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_search_settings_get_at_word_boundaries (GtkSourceSearchSettings *settings); - +gboolean gtk_source_search_settings_get_at_word_boundaries (GtkSourceSearchSettings *settings); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_search_settings_set_wrap_around (GtkSourceSearchSettings *settings, - gboolean wrap_around); - +void gtk_source_search_settings_set_wrap_around (GtkSourceSearchSettings *settings, + gboolean wrap_around); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_search_settings_get_wrap_around (GtkSourceSearchSettings *settings); - +gboolean gtk_source_search_settings_get_wrap_around (GtkSourceSearchSettings *settings); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_search_settings_set_regex_enabled (GtkSourceSearchSettings *settings, - gboolean regex_enabled); - +void gtk_source_search_settings_set_regex_enabled (GtkSourceSearchSettings *settings, + gboolean regex_enabled); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_search_settings_get_regex_enabled (GtkSourceSearchSettings *settings); +gboolean gtk_source_search_settings_get_regex_enabled (GtkSourceSearchSettings *settings); G_END_DECLS -- GitLab From 8b4cfdb26b35e2f10ad60de26e6ba1b45b158cbe Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:24:44 -0800 Subject: [PATCH 029/248] spaces: modernize GtkSourceSpaceDrawer - Use G_DECLARE_ - Make final - Fix multi-line function indentation --- gtksourceview/gtksourceautocleanups.h | 1 - gtksourceview/gtksourcespacedrawer.c | 155 +++++++++++++------------- gtksourceview/gtksourcespacedrawer.h | 65 +++-------- 3 files changed, 95 insertions(+), 126 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index c93ca5ef..1d6cbe49 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceSpaceDrawer, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserButton, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserWidget, g_object_unref) diff --git a/gtksourceview/gtksourcespacedrawer.c b/gtksourceview/gtksourcespacedrawer.c index 98ff77bf..9f2613ba 100644 --- a/gtksourceview/gtksourcespacedrawer.c +++ b/gtksourceview/gtksourcespacedrawer.c @@ -93,8 +93,9 @@ */ #undef ENABLE_PROFILE -struct _GtkSourceSpaceDrawerPrivate +struct _GtkSourceSpaceDrawer { + GObject parent_instance; GtkSourceSpaceTypeFlags *matrix; GdkRGBA *color; guint enable_matrix : 1; @@ -110,7 +111,7 @@ enum static GParamSpec *properties[N_PROPERTIES]; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceSpaceDrawer, gtk_source_space_drawer, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkSourceSpaceDrawer, gtk_source_space_drawer, G_TYPE_OBJECT) static gint get_number_of_locations (void) @@ -163,7 +164,7 @@ is_zero_matrix (GtkSourceSpaceDrawer *drawer) for (i = 0; i < num_locations; i++) { - if (drawer->priv->matrix[i] != 0) + if (drawer->matrix[i] != 0) { return FALSE; } @@ -183,9 +184,9 @@ set_zero_matrix (GtkSourceSpaceDrawer *drawer) for (i = 0; i < num_locations; i++) { - if (drawer->priv->matrix[i] != 0) + if (drawer->matrix[i] != 0) { - drawer->priv->matrix[i] = 0; + drawer->matrix[i] = 0; changed = TRUE; } } @@ -199,7 +200,7 @@ set_zero_matrix (GtkSourceSpaceDrawer *drawer) /* AND */ static GtkSourceSpaceTypeFlags get_types_at_all_locations (GtkSourceSpaceDrawer *drawer, - GtkSourceSpaceLocationFlags locations) + GtkSourceSpaceLocationFlags locations) { GtkSourceSpaceTypeFlags ret = GTK_SOURCE_SPACE_TYPE_ALL; gint index; @@ -214,7 +215,7 @@ get_types_at_all_locations (GtkSourceSpaceDrawer *drawer, { if ((locations & 1) == 1) { - ret &= drawer->priv->matrix[index]; + ret &= drawer->matrix[index]; found = TRUE; } @@ -228,7 +229,7 @@ get_types_at_all_locations (GtkSourceSpaceDrawer *drawer, /* OR */ static GtkSourceSpaceTypeFlags get_types_at_any_locations (GtkSourceSpaceDrawer *drawer, - GtkSourceSpaceLocationFlags locations) + GtkSourceSpaceLocationFlags locations) { GtkSourceSpaceTypeFlags ret = GTK_SOURCE_SPACE_TYPE_NONE; gint index; @@ -241,7 +242,7 @@ get_types_at_any_locations (GtkSourceSpaceDrawer *drawer, { if ((locations & 1) == 1) { - ret |= drawer->priv->matrix[index]; + ret |= drawer->matrix[index]; } locations >>= 1; @@ -253,9 +254,9 @@ get_types_at_any_locations (GtkSourceSpaceDrawer *drawer, static void gtk_source_space_drawer_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceSpaceDrawer *drawer = GTK_SOURCE_SPACE_DRAWER (object); @@ -277,9 +278,9 @@ gtk_source_space_drawer_get_property (GObject *object, static void gtk_source_space_drawer_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceSpaceDrawer *drawer = GTK_SOURCE_SPACE_DRAWER (object); @@ -304,11 +305,11 @@ gtk_source_space_drawer_finalize (GObject *object) { GtkSourceSpaceDrawer *drawer = GTK_SOURCE_SPACE_DRAWER (object); - g_free (drawer->priv->matrix); + g_free (drawer->matrix); - if (drawer->priv->color != NULL) + if (drawer->color != NULL) { - gdk_rgba_free (drawer->priv->color); + gdk_rgba_free (drawer->color); } G_OBJECT_CLASS (gtk_source_space_drawer_parent_class)->finalize (object); @@ -374,9 +375,7 @@ gtk_source_space_drawer_class_init (GtkSourceSpaceDrawerClass *klass) static void gtk_source_space_drawer_init (GtkSourceSpaceDrawer *drawer) { - drawer->priv = gtk_source_space_drawer_get_instance_private (drawer); - - drawer->priv->matrix = g_new0 (GtkSourceSpaceTypeFlags, get_number_of_locations ()); + drawer->matrix = g_new0 (GtkSourceSpaceTypeFlags, get_number_of_locations ()); } /** @@ -413,7 +412,7 @@ gtk_source_space_drawer_new (void) */ GtkSourceSpaceTypeFlags gtk_source_space_drawer_get_types_for_locations (GtkSourceSpaceDrawer *drawer, - GtkSourceSpaceLocationFlags locations) + GtkSourceSpaceLocationFlags locations) { g_return_val_if_fail (GTK_SOURCE_IS_SPACE_DRAWER (drawer), GTK_SOURCE_SPACE_TYPE_NONE); @@ -433,8 +432,8 @@ gtk_source_space_drawer_get_types_for_locations (GtkSourceSpaceDrawer *dr */ void gtk_source_space_drawer_set_types_for_locations (GtkSourceSpaceDrawer *drawer, - GtkSourceSpaceLocationFlags locations, - GtkSourceSpaceTypeFlags types) + GtkSourceSpaceLocationFlags locations, + GtkSourceSpaceTypeFlags types) { gint index; gint num_locations; @@ -448,9 +447,9 @@ gtk_source_space_drawer_set_types_for_locations (GtkSourceSpaceDrawer *dr while (locations != 0 && index < num_locations) { if ((locations & 1) == 1 && - drawer->priv->matrix[index] != types) + drawer->matrix[index] != types) { - drawer->priv->matrix[index] = types; + drawer->matrix[index] = types; changed = TRUE; } @@ -500,7 +499,7 @@ gtk_source_space_drawer_get_matrix (GtkSourceSpaceDrawer *drawer) { GVariant *space_types; - space_types = g_variant_new_uint32 (drawer->priv->matrix[i]); + space_types = g_variant_new_uint32 (drawer->matrix[i]); g_variant_builder_add_value (&builder, space_types); } @@ -525,7 +524,7 @@ gtk_source_space_drawer_get_matrix (GtkSourceSpaceDrawer *drawer) */ void gtk_source_space_drawer_set_matrix (GtkSourceSpaceDrawer *drawer, - GVariant *matrix) + GVariant *matrix) { gint num_locations; gint index; @@ -559,9 +558,9 @@ gtk_source_space_drawer_set_matrix (GtkSourceSpaceDrawer *drawer, space_types = g_variant_get_uint32 (child); - if (drawer->priv->matrix[index] != space_types) + if (drawer->matrix[index] != space_types) { - drawer->priv->matrix[index] = space_types; + drawer->matrix[index] = space_types; changed = TRUE; } @@ -571,9 +570,9 @@ gtk_source_space_drawer_set_matrix (GtkSourceSpaceDrawer *drawer, while (index < num_locations) { - if (drawer->priv->matrix[index] != 0) + if (drawer->matrix[index] != 0) { - drawer->priv->matrix[index] = 0; + drawer->matrix[index] = 0; changed = TRUE; } @@ -604,7 +603,7 @@ gtk_source_space_drawer_get_enable_matrix (GtkSourceSpaceDrawer *drawer) { g_return_val_if_fail (GTK_SOURCE_IS_SPACE_DRAWER (drawer), FALSE); - return drawer->priv->enable_matrix; + return drawer->enable_matrix; } /** @@ -618,23 +617,23 @@ gtk_source_space_drawer_get_enable_matrix (GtkSourceSpaceDrawer *drawer) */ void gtk_source_space_drawer_set_enable_matrix (GtkSourceSpaceDrawer *drawer, - gboolean enable_matrix) + gboolean enable_matrix) { g_return_if_fail (GTK_SOURCE_IS_SPACE_DRAWER (drawer)); enable_matrix = enable_matrix != FALSE; - if (drawer->priv->enable_matrix != enable_matrix) + if (drawer->enable_matrix != enable_matrix) { - drawer->priv->enable_matrix = enable_matrix; + drawer->enable_matrix = enable_matrix; g_object_notify_by_pspec (G_OBJECT (drawer), properties[PROP_ENABLE_MATRIX]); } } static gboolean matrix_get_mapping (GValue *value, - GVariant *variant, - gpointer user_data) + GVariant *variant, + gpointer user_data) { g_value_set_variant (value, variant); return TRUE; @@ -642,8 +641,8 @@ matrix_get_mapping (GValue *value, static GVariant * matrix_set_mapping (const GValue *value, - const GVariantType *expected_type, - gpointer user_data) + const GVariantType *expected_type, + gpointer user_data) { return g_value_dup_variant (value); } @@ -669,9 +668,9 @@ matrix_set_mapping (const GValue *value, */ void gtk_source_space_drawer_bind_matrix_setting (GtkSourceSpaceDrawer *drawer, - GSettings *settings, - const gchar *key, - GSettingsBindFlags flags) + GSettings *settings, + const gchar *key, + GSettingsBindFlags flags) { GVariant *value; @@ -699,7 +698,7 @@ gtk_source_space_drawer_bind_matrix_setting (GtkSourceSpaceDrawer *drawer, void _gtk_source_space_drawer_update_color (GtkSourceSpaceDrawer *drawer, - GtkSourceView *view) + GtkSourceView *view) { GtkSourceBuffer *buffer; GtkSourceStyleScheme *style_scheme; @@ -707,10 +706,10 @@ _gtk_source_space_drawer_update_color (GtkSourceSpaceDrawer *drawer, g_return_if_fail (GTK_SOURCE_IS_SPACE_DRAWER (drawer)); g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); - if (drawer->priv->color != NULL) + if (drawer->color != NULL) { - gdk_rgba_free (drawer->priv->color); - drawer->priv->color = NULL; + gdk_rgba_free (drawer->color); + drawer->color = NULL; } buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); @@ -737,14 +736,14 @@ _gtk_source_space_drawer_update_color (GtkSourceSpaceDrawer *drawer, color_str != NULL && gdk_rgba_parse (&color, color_str)) { - drawer->priv->color = gdk_rgba_copy (&color); + drawer->color = gdk_rgba_copy (&color); } g_free (color_str); } } - if (drawer->priv->color == NULL) + if (drawer->color == NULL) { GtkStyleContext *context; GdkRGBA color; @@ -757,7 +756,7 @@ _gtk_source_space_drawer_update_color (GtkSourceSpaceDrawer *drawer, &color); gtk_style_context_restore (context); - drawer->priv->color = gdk_rgba_copy (&color); + drawer->color = gdk_rgba_copy (&color); } } @@ -808,7 +807,7 @@ is_whitespace (gunichar ch) static void draw_space_at_pos (cairo_t *cr, - GdkRectangle rect) + GdkRectangle rect) { gint x, y; gdouble w; @@ -827,7 +826,7 @@ draw_space_at_pos (cairo_t *cr, static void draw_tab_at_pos (cairo_t *cr, - GdkRectangle rect) + GdkRectangle rect) { gint x, y; gdouble w, h; @@ -850,7 +849,7 @@ draw_tab_at_pos (cairo_t *cr, static void draw_newline_at_pos (cairo_t *cr, - GdkRectangle rect) + GdkRectangle rect) { gint x, y; gdouble w, h; @@ -888,8 +887,8 @@ draw_newline_at_pos (cairo_t *cr, static void draw_nbsp_at_pos (cairo_t *cr, - GdkRectangle rect, - gboolean narrowed) + GdkRectangle rect, + gboolean narrowed) { gint x, y; gdouble w, h; @@ -920,8 +919,8 @@ draw_nbsp_at_pos (cairo_t *cr, static void draw_whitespace_at_iter (GtkTextView *text_view, - GtkTextIter *iter, - cairo_t *cr) + GtkTextIter *iter, + cairo_t *cr) { gunichar ch; GdkRectangle rect; @@ -958,8 +957,8 @@ draw_whitespace_at_iter (GtkTextView *text_view, static void space_needs_drawing_according_to_tag (const GtkTextIter *iter, - gboolean *has_tag, - gboolean *needs_drawing) + gboolean *has_tag, + gboolean *needs_drawing) { GSList *tags; GSList *l; @@ -998,8 +997,8 @@ space_needs_drawing_according_to_tag (const GtkTextIter *iter, static GtkSourceSpaceLocationFlags get_iter_locations (const GtkTextIter *iter, - const GtkTextIter *leading_end, - const GtkTextIter *trailing_start) + const GtkTextIter *leading_end, + const GtkTextIter *trailing_start) { GtkSourceSpaceLocationFlags iter_locations = GTK_SOURCE_SPACE_LOCATION_NONE; @@ -1051,9 +1050,9 @@ get_iter_space_type (const GtkTextIter *iter) static gboolean space_needs_drawing_according_to_matrix (GtkSourceSpaceDrawer *drawer, - const GtkTextIter *iter, - const GtkTextIter *leading_end, - const GtkTextIter *trailing_start) + const GtkTextIter *iter, + const GtkTextIter *leading_end, + const GtkTextIter *trailing_start) { GtkSourceSpaceLocationFlags iter_locations; GtkSourceSpaceTypeFlags iter_space_type; @@ -1068,9 +1067,9 @@ space_needs_drawing_according_to_matrix (GtkSourceSpaceDrawer *drawer, static gboolean space_needs_drawing (GtkSourceSpaceDrawer *drawer, - const GtkTextIter *iter, - const GtkTextIter *leading_end, - const GtkTextIter *trailing_start) + const GtkTextIter *iter, + const GtkTextIter *leading_end, + const GtkTextIter *trailing_start) { gboolean has_tag; gboolean needs_drawing; @@ -1083,17 +1082,17 @@ space_needs_drawing (GtkSourceSpaceDrawer *drawer, } /* Check the matrix */ - return (drawer->priv->enable_matrix && + return (drawer->enable_matrix && space_needs_drawing_according_to_matrix (drawer, iter, leading_end, trailing_start)); } static void get_line_end (GtkTextView *text_view, - const GtkTextIter *start_iter, - GtkTextIter *line_end, - gint max_x, - gint max_y, - gboolean is_wrapping) + const GtkTextIter *start_iter, + GtkTextIter *line_end, + gint max_x, + gint max_y, + gboolean is_wrapping) { gint min; gint max; @@ -1143,8 +1142,8 @@ get_line_end (GtkTextView *text_view, void _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer, - GtkSourceView *view, - cairo_t *cr) + GtkSourceView *view, + cairo_t *cr) { GtkTextView *text_view; GtkTextBuffer *buffer; @@ -1175,7 +1174,7 @@ _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer, g_return_if_fail (GTK_SOURCE_IS_VIEW (view)); g_return_if_fail (cr != NULL); - if (drawer->priv->color == NULL) + if (drawer->color == NULL) { g_warning ("GtkSourceSpaceDrawer: color not set."); return; @@ -1184,7 +1183,7 @@ _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer, text_view = GTK_TEXT_VIEW (view); buffer = gtk_text_view_get_buffer (text_view); - if ((!drawer->priv->enable_matrix || is_zero_matrix (drawer)) && + if ((!drawer->enable_matrix || is_zero_matrix (drawer)) && !_gtk_source_buffer_has_spaces_tag (GTK_SOURCE_BUFFER (buffer))) { return; @@ -1206,7 +1205,7 @@ _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer, gtk_text_view_get_iter_at_location (text_view, &end, max_x, max_y); cairo_save (cr); - gdk_cairo_set_source_rgba (cr, drawer->priv->color); + gdk_cairo_set_source_rgba (cr, drawer->color); cairo_set_line_width (cr, 0.8); cairo_translate (cr, -0.5, -0.5); diff --git a/gtksourceview/gtksourcespacedrawer.h b/gtksourceview/gtksourcespacedrawer.h index 3ffb9fb8..ec6161de 100644 --- a/gtksourceview/gtksourcespacedrawer.h +++ b/gtksourceview/gtksourcespacedrawer.h @@ -29,29 +29,7 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_SPACE_DRAWER (gtk_source_space_drawer_get_type ()) -#define GTK_SOURCE_SPACE_DRAWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_SPACE_DRAWER, GtkSourceSpaceDrawer)) -#define GTK_SOURCE_SPACE_DRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_SPACE_DRAWER, GtkSourceSpaceDrawerClass)) -#define GTK_SOURCE_IS_SPACE_DRAWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_SPACE_DRAWER)) -#define GTK_SOURCE_IS_SPACE_DRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_SPACE_DRAWER)) -#define GTK_SOURCE_SPACE_DRAWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_SPACE_DRAWER, GtkSourceSpaceDrawerClass)) - -typedef struct _GtkSourceSpaceDrawerClass GtkSourceSpaceDrawerClass; -typedef struct _GtkSourceSpaceDrawerPrivate GtkSourceSpaceDrawerPrivate; - -struct _GtkSourceSpaceDrawer -{ - GObject parent; - - GtkSourceSpaceDrawerPrivate *priv; -}; - -struct _GtkSourceSpaceDrawerClass -{ - GObjectClass parent_class; - - gpointer padding[20]; -}; +#define GTK_SOURCE_TYPE_SPACE_DRAWER (gtk_source_space_drawer_get_type()) /** * GtkSourceSpaceTypeFlags: @@ -104,38 +82,31 @@ typedef enum _GtkSourceSpaceLocationFlags } GtkSourceSpaceLocationFlags; GTK_SOURCE_AVAILABLE_IN_3_24 -GType gtk_source_space_drawer_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceSpaceDrawer, gtk_source_space_drawer, GTK_SOURCE, SPACE_DRAWER, GObject) GTK_SOURCE_AVAILABLE_IN_3_24 -GtkSourceSpaceDrawer * gtk_source_space_drawer_new (void); - +GtkSourceSpaceDrawer *gtk_source_space_drawer_new (void); GTK_SOURCE_AVAILABLE_IN_3_24 -GtkSourceSpaceTypeFlags gtk_source_space_drawer_get_types_for_locations (GtkSourceSpaceDrawer *drawer, - GtkSourceSpaceLocationFlags locations); - +GtkSourceSpaceTypeFlags gtk_source_space_drawer_get_types_for_locations (GtkSourceSpaceDrawer *drawer, + GtkSourceSpaceLocationFlags locations); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_space_drawer_set_types_for_locations (GtkSourceSpaceDrawer *drawer, - GtkSourceSpaceLocationFlags locations, - GtkSourceSpaceTypeFlags types); - +void gtk_source_space_drawer_set_types_for_locations (GtkSourceSpaceDrawer *drawer, + GtkSourceSpaceLocationFlags locations, + GtkSourceSpaceTypeFlags types); GTK_SOURCE_AVAILABLE_IN_3_24 -GVariant * gtk_source_space_drawer_get_matrix (GtkSourceSpaceDrawer *drawer); - +GVariant *gtk_source_space_drawer_get_matrix (GtkSourceSpaceDrawer *drawer); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_space_drawer_set_matrix (GtkSourceSpaceDrawer *drawer, - GVariant *matrix); - +void gtk_source_space_drawer_set_matrix (GtkSourceSpaceDrawer *drawer, + GVariant *matrix); GTK_SOURCE_AVAILABLE_IN_3_24 -gboolean gtk_source_space_drawer_get_enable_matrix (GtkSourceSpaceDrawer *drawer); - +gboolean gtk_source_space_drawer_get_enable_matrix (GtkSourceSpaceDrawer *drawer); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_space_drawer_set_enable_matrix (GtkSourceSpaceDrawer *drawer, - gboolean enable_matrix); - +void gtk_source_space_drawer_set_enable_matrix (GtkSourceSpaceDrawer *drawer, + gboolean enable_matrix); GTK_SOURCE_AVAILABLE_IN_3_24 -void gtk_source_space_drawer_bind_matrix_setting (GtkSourceSpaceDrawer *drawer, - GSettings *settings, - const gchar *key, - GSettingsBindFlags flags); +void gtk_source_space_drawer_bind_matrix_setting (GtkSourceSpaceDrawer *drawer, + GSettings *settings, + const gchar *key, + GSettingsBindFlags flags); G_END_DECLS -- GitLab From 714eb6af66778e5b958afc56beaa0bc58542766e Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:36:13 -0800 Subject: [PATCH 030/248] chooser: modernize GtkSourceStyleSchemeChooser - Use G_DECLARE_ - Use get_instance_private() - Cleanup multi-line function indentation --- gtksourceview/gtksourceautocleanups.h | 2 -- gtksourceview/gtksourcestyleschemechooser.h | 22 +++++++---------- .../gtksourcestyleschemechooserbutton.c | 24 +++++++++---------- .../gtksourcestyleschemechooserbutton.h | 22 ++++------------- .../gtksourcestyleschemechooserwidget.c | 22 ++++++++--------- .../gtksourcestyleschemechooserwidget.h | 22 ++++------------- 6 files changed, 39 insertions(+), 75 deletions(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index 1d6cbe49..dcfb9d31 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -29,8 +29,6 @@ G_BEGIN_DECLS #ifndef __GI_SCANNER__ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserButton, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeChooserWidget, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceUndoManager, g_object_unref) diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h index 33870c1f..4c9e6189 100644 --- a/gtksourceview/gtksourcestyleschemechooser.h +++ b/gtksourceview/gtksourcestyleschemechooser.h @@ -29,12 +29,10 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER (gtk_source_style_scheme_chooser_get_type ()) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER, GtkSourceStyleSchemeChooser)) -#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER, GtkSourceStyleSchemeChooserInterface)) +#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER (gtk_source_style_scheme_chooser_get_type()) -typedef struct _GtkSourceStyleSchemeChooserInterface GtkSourceStyleSchemeChooserInterface; +GTK_SOURCE_AVAILABLE_IN_3_16 +G_DECLARE_INTERFACE (GtkSourceStyleSchemeChooser, gtk_source_style_scheme_chooser, GTK_SOURCE, STYLE_SCHEME_CHOOSER, GObject) struct _GtkSourceStyleSchemeChooserInterface { @@ -46,18 +44,14 @@ struct _GtkSourceStyleSchemeChooserInterface void (* set_style_scheme) (GtkSourceStyleSchemeChooser *chooser, GtkSourceStyleScheme *scheme); - /* Padding */ - gpointer padding[12]; + /*< private >*/ + gpointer _reserved[12]; }; GTK_SOURCE_AVAILABLE_IN_3_16 -GType gtk_source_style_scheme_chooser_get_type (void) G_GNUC_CONST; - -GTK_SOURCE_AVAILABLE_IN_3_16 -GtkSourceStyleScheme *gtk_source_style_scheme_chooser_get_style_scheme (GtkSourceStyleSchemeChooser *chooser); - +GtkSourceStyleScheme *gtk_source_style_scheme_chooser_get_style_scheme (GtkSourceStyleSchemeChooser *chooser); GTK_SOURCE_AVAILABLE_IN_3_16 -void gtk_source_style_scheme_chooser_set_style_scheme (GtkSourceStyleSchemeChooser *chooser, - GtkSourceStyleScheme *scheme); +void gtk_source_style_scheme_chooser_set_style_scheme (GtkSourceStyleSchemeChooser *chooser, + GtkSourceStyleScheme *scheme); G_END_DECLS diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.c b/gtksourceview/gtksourcestyleschemechooserbutton.c index 77d5d1b3..939a91fa 100644 --- a/gtksourceview/gtksourcestyleschemechooserbutton.c +++ b/gtksourceview/gtksourcestyleschemechooserbutton.c @@ -52,16 +52,14 @@ typedef struct GtkSourceStyleSchemeChooserWidget *chooser; } GtkSourceStyleSchemeChooserButtonPrivate; -static void gtk_source_style_scheme_chooser_button_style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface); +static void style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface); G_DEFINE_TYPE_WITH_CODE (GtkSourceStyleSchemeChooserButton, gtk_source_style_scheme_chooser_button, GTK_TYPE_BUTTON, G_ADD_PRIVATE (GtkSourceStyleSchemeChooserButton) G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER, - gtk_source_style_scheme_chooser_button_style_scheme_chooser_interface_init)) - -#define GET_PRIV(o) gtk_source_style_scheme_chooser_button_get_instance_private (o) + style_scheme_chooser_interface_init)) enum { @@ -73,7 +71,7 @@ static void gtk_source_style_scheme_chooser_button_dispose (GObject *object) { GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (object); - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); g_clear_object (&priv->scheme); @@ -132,7 +130,7 @@ dialog_destroy (GtkWidget *widget, gpointer data) { GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (data); - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); priv->dialog = NULL; priv->chooser = NULL; @@ -152,7 +150,7 @@ dialog_response (GtkDialog *dialog, else if (response == GTK_RESPONSE_OK) { GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (data); - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); GtkSourceStyleScheme *scheme; scheme = gtk_source_style_scheme_chooser_get_style_scheme (GTK_SOURCE_STYLE_SCHEME_CHOOSER (priv->chooser)); @@ -168,7 +166,7 @@ dialog_response (GtkDialog *dialog, static void ensure_dialog (GtkSourceStyleSchemeChooserButton *button) { - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); GtkWidget *parent, *dialog, *scrolled_window; GtkWidget *content_area; @@ -225,7 +223,7 @@ static void gtk_source_style_scheme_chooser_button_clicked (GtkButton *button) { GtkSourceStyleSchemeChooserButton *cbutton = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (button); - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (cbutton); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (cbutton); ensure_dialog (cbutton); @@ -260,7 +258,7 @@ static GtkSourceStyleScheme * gtk_source_style_scheme_chooser_button_get_style_scheme (GtkSourceStyleSchemeChooser *chooser) { GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (chooser); - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); return priv->scheme; } @@ -268,7 +266,7 @@ gtk_source_style_scheme_chooser_button_get_style_scheme (GtkSourceStyleSchemeCho static void gtk_source_style_scheme_chooser_button_update_label (GtkSourceStyleSchemeChooserButton *button) { - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); const gchar *label; label = priv->scheme != NULL ? gtk_source_style_scheme_get_name (priv->scheme) : NULL; @@ -280,7 +278,7 @@ gtk_source_style_scheme_chooser_button_set_style_scheme (GtkSourceStyleSchemeCho GtkSourceStyleScheme *scheme) { GtkSourceStyleSchemeChooserButton *button = GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON (chooser); - GtkSourceStyleSchemeChooserButtonPrivate *priv = GET_PRIV (button); + GtkSourceStyleSchemeChooserButtonPrivate *priv = gtk_source_style_scheme_chooser_button_get_instance_private (button); if (g_set_object (&priv->scheme, scheme)) { @@ -291,7 +289,7 @@ gtk_source_style_scheme_chooser_button_set_style_scheme (GtkSourceStyleSchemeCho } static void -gtk_source_style_scheme_chooser_button_style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface) +style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface) { iface->get_style_scheme = gtk_source_style_scheme_chooser_button_get_style_scheme; iface->set_style_scheme = gtk_source_style_scheme_chooser_button_set_style_scheme; diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h b/gtksourceview/gtksourcestyleschemechooserbutton.h index 5b53dafb..c515b26a 100644 --- a/gtksourceview/gtksourcestyleschemechooserbutton.h +++ b/gtksourceview/gtksourcestyleschemechooserbutton.h @@ -30,32 +30,20 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON (gtk_source_style_scheme_chooser_button_get_type()) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButton)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButton const)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButtonClass)) -#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON)) -#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON, GtkSourceStyleSchemeChooserButtonClass)) - -typedef struct _GtkSourceStyleSchemeChooserButtonClass GtkSourceStyleSchemeChooserButtonClass; - -struct _GtkSourceStyleSchemeChooserButton -{ - GtkButton parent; -}; +#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_BUTTON (gtk_source_style_scheme_chooser_button_get_type()) struct _GtkSourceStyleSchemeChooserButtonClass { GtkButtonClass parent; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_3_16 -GType gtk_source_style_scheme_chooser_button_get_type (void); +G_DECLARE_DERIVABLE_TYPE (GtkSourceStyleSchemeChooserButton, gtk_source_style_scheme_chooser_button, GTK_SOURCE, STYLE_SCHEME_CHOOSER_BUTTON, GtkButton) GTK_SOURCE_AVAILABLE_IN_3_16 -GtkWidget *gtk_source_style_scheme_chooser_button_new (void); +GtkWidget *gtk_source_style_scheme_chooser_button_new (void); G_END_DECLS diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.c b/gtksourceview/gtksourcestyleschemechooserwidget.c index 91025a35..0f00adf5 100644 --- a/gtksourceview/gtksourcestyleschemechooserwidget.c +++ b/gtksourceview/gtksourcestyleschemechooserwidget.c @@ -54,16 +54,14 @@ typedef struct GtkSourceStyleScheme *scheme; } GtkSourceStyleSchemeChooserWidgetPrivate; -static void gtk_source_style_scheme_chooser_widget_style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface); +static void style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface); G_DEFINE_TYPE_WITH_CODE (GtkSourceStyleSchemeChooserWidget, gtk_source_style_scheme_chooser_widget, GTK_TYPE_BIN, G_ADD_PRIVATE (GtkSourceStyleSchemeChooserWidget) G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER, - gtk_source_style_scheme_chooser_widget_style_scheme_chooser_interface_init)) - -#define GET_PRIV(o) gtk_source_style_scheme_chooser_widget_get_instance_private (o) + style_scheme_chooser_interface_init)) enum { @@ -75,7 +73,7 @@ static void gtk_source_style_scheme_chooser_widget_dispose (GObject *object) { GtkSourceStyleSchemeChooserWidget *widget = GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET (object); - GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget); + GtkSourceStyleSchemeChooserWidgetPrivate *priv = gtk_source_style_scheme_chooser_widget_get_instance_private (widget); g_clear_object (&priv->scheme); @@ -184,7 +182,7 @@ on_row_selected (GtkListBox *list_box, GtkListBoxRow *row, GtkSourceStyleSchemeChooserWidget *widget) { - GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget); + GtkSourceStyleSchemeChooserWidgetPrivate *priv = gtk_source_style_scheme_chooser_widget_get_instance_private (widget); if (row != NULL) { @@ -201,7 +199,7 @@ on_row_selected (GtkListBox *list_box, static void destroy_child_cb (GtkWidget *widget, - gpointer data) + gpointer data) { gtk_widget_destroy (widget); } @@ -209,7 +207,7 @@ destroy_child_cb (GtkWidget *widget, static void gtk_source_style_scheme_chooser_widget_populate (GtkSourceStyleSchemeChooserWidget *widget) { - GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget); + GtkSourceStyleSchemeChooserWidgetPrivate *priv = gtk_source_style_scheme_chooser_widget_get_instance_private (widget); GtkSourceLanguageManager *lm; GtkSourceLanguage *lang; GtkSourceStyleSchemeManager *manager; @@ -267,7 +265,7 @@ on_scheme_ids_changed (GtkSourceStyleSchemeManager *manager, static void gtk_source_style_scheme_chooser_widget_init (GtkSourceStyleSchemeChooserWidget *widget) { - GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget); + GtkSourceStyleSchemeChooserWidgetPrivate *priv = gtk_source_style_scheme_chooser_widget_get_instance_private (widget); GtkSourceStyleSchemeManager *manager; priv->list_box = GTK_LIST_BOX (gtk_list_box_new ()); @@ -296,7 +294,7 @@ static GtkSourceStyleScheme * gtk_source_style_scheme_chooser_widget_get_style_scheme (GtkSourceStyleSchemeChooser *chooser) { GtkSourceStyleSchemeChooserWidget *widget = GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET (chooser); - GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget); + GtkSourceStyleSchemeChooserWidgetPrivate *priv = gtk_source_style_scheme_chooser_widget_get_instance_private (widget); return priv->scheme; } @@ -306,7 +304,7 @@ gtk_source_style_scheme_chooser_widget_set_style_scheme (GtkSourceStyleSchemeCho GtkSourceStyleScheme *scheme) { GtkSourceStyleSchemeChooserWidget *widget = GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET (chooser); - GtkSourceStyleSchemeChooserWidgetPrivate *priv = GET_PRIV (widget); + GtkSourceStyleSchemeChooserWidgetPrivate *priv = gtk_source_style_scheme_chooser_widget_get_instance_private (widget); if (g_set_object (&priv->scheme, scheme)) { @@ -338,7 +336,7 @@ gtk_source_style_scheme_chooser_widget_set_style_scheme (GtkSourceStyleSchemeCho } static void -gtk_source_style_scheme_chooser_widget_style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface) +style_scheme_chooser_interface_init (GtkSourceStyleSchemeChooserInterface *iface) { iface->get_style_scheme = gtk_source_style_scheme_chooser_widget_get_style_scheme; iface->set_style_scheme = gtk_source_style_scheme_chooser_widget_set_style_scheme; diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.h b/gtksourceview/gtksourcestyleschemechooserwidget.h index 77a5e7b0..ceb9320b 100644 --- a/gtksourceview/gtksourcestyleschemechooserwidget.h +++ b/gtksourceview/gtksourcestyleschemechooserwidget.h @@ -30,32 +30,20 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET (gtk_source_style_scheme_chooser_widget_get_type()) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidget)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidget const)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidgetClass)) -#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET)) -#define GTK_SOURCE_IS_STYLE_SCHEME_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET)) -#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET, GtkSourceStyleSchemeChooserWidgetClass)) - -typedef struct _GtkSourceStyleSchemeChooserWidgetClass GtkSourceStyleSchemeChooserWidgetClass; - -struct _GtkSourceStyleSchemeChooserWidget -{ - GtkBin parent; -}; +#define GTK_SOURCE_TYPE_STYLE_SCHEME_CHOOSER_WIDGET (gtk_source_style_scheme_chooser_widget_get_type()) struct _GtkSourceStyleSchemeChooserWidgetClass { GtkBinClass parent; - gpointer padding[10]; + /*< private >*/ + gpointer _reserved[10]; }; GTK_SOURCE_AVAILABLE_IN_3_16 -GType gtk_source_style_scheme_chooser_widget_get_type (void); +G_DECLARE_DERIVABLE_TYPE (GtkSourceStyleSchemeChooserWidget, gtk_source_style_scheme_chooser_widget, GTK_SOURCE, STYLE_SCHEME_CHOOSER_WIDGET, GtkBin) GTK_SOURCE_AVAILABLE_IN_3_16 -GtkWidget *gtk_source_style_scheme_chooser_widget_new (void); +GtkWidget *gtk_source_style_scheme_chooser_widget_new (void); G_END_DECLS -- GitLab From f2ef9465f5fc1c02056307531da531604d169c79 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:36:56 -0800 Subject: [PATCH 031/248] undo: remove from autocleanups The undo manager will not be part of GtkSourceView 5, so just remove it now to allow us to delete the autocleanups.h. Undo is now handled by GTK 4 so as we migrate we will use that. --- gtksourceview/gtksourceautocleanups.h | 1 - 1 file changed, 1 deletion(-) diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h index dcfb9d31..43a097a6 100644 --- a/gtksourceview/gtksourceautocleanups.h +++ b/gtksourceview/gtksourceautocleanups.h @@ -30,7 +30,6 @@ G_BEGIN_DECLS G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeManager, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceUndoManager, g_object_unref) #endif /* __GI_SCANNER__ */ -- GitLab From 21191e9b9a81ef9ada031039be0f5dd2420e20bb Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:48:52 -0800 Subject: [PATCH 032/248] build: remove gtksourceautocleanups.h We wont need this going forward with everything using G_DECLARE --- gtksourceview/gtksource.h | 1 - gtksourceview/gtksourceautocleanups.h | 36 --------------------------- gtksourceview/meson.build | 1 - 3 files changed, 38 deletions(-) delete mode 100644 gtksourceview/gtksourceautocleanups.h diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h index fcd5a6fc..a3fd2862 100644 --- a/gtksourceview/gtksource.h +++ b/gtksourceview/gtksource.h @@ -59,6 +59,5 @@ #include #include #include -#include #undef GTK_SOURCE_H_INSIDE diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h deleted file mode 100644 index 43a097a6..00000000 --- a/gtksourceview/gtksourceautocleanups.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of gtksourceview - * - * gtksourceview is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * gtksourceview is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, see . - */ - -#pragma once - -#if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) -#error "Only can be included directly." -#endif - -#include -#include - -G_BEGIN_DECLS - -#ifndef __GI_SCANNER__ - -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleScheme, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceStyleSchemeManager, g_object_unref) - -#endif /* __GI_SCANNER__ */ - -G_END_DECLS diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build index fd080a9c..2aec8499 100644 --- a/gtksourceview/meson.build +++ b/gtksourceview/meson.build @@ -7,7 +7,6 @@ core_marshallers = gnome.genmarshal('gtksource-marshal', core_public_h = files([ 'gtksource.h', - 'gtksourceautocleanups.h', 'gtksourcebuffer.h', 'gtksourcecompletion.h', 'gtksourcecompletioncontext.h', -- GitLab From 6bd1cb31c109f4846f8b59e295480bd6b9591cef Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:49:43 -0800 Subject: [PATCH 033/248] scheme: modernize GtkSourceStyleScheme - Use G_DECLARE - Make final - Fix multi-line function indentation --- gtksourceview/gtksourcestylescheme.c | 235 ++++++++++++++------------- gtksourceview/gtksourcestylescheme.h | 88 +++------- 2 files changed, 144 insertions(+), 179 deletions(-) diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c index e37c625d..bbba653f 100644 --- a/gtksourceview/gtksourcestylescheme.c +++ b/gtksourceview/gtksourcestylescheme.c @@ -20,10 +20,11 @@ #include "config.h" -#include "gtksourcestylescheme.h" #include #include #include + +#include "gtksourcestylescheme.h" #include "gtksourcestyleschememanager.h" #include "gtksourcestyle.h" #include "gtksourcestyle-private.h" @@ -76,8 +77,10 @@ enum PROP_FILENAME }; -struct _GtkSourceStyleSchemePrivate +struct _GtkSourceStyleScheme { + GObject parent_instance; + gchar *id; gchar *name; GPtrArray *authors; @@ -93,34 +96,34 @@ struct _GtkSourceStyleSchemePrivate GtkCssProvider *css_provider_cursors; }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceStyleScheme, gtk_source_style_scheme, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkSourceStyleScheme, gtk_source_style_scheme, G_TYPE_OBJECT) static void gtk_source_style_scheme_dispose (GObject *object) { GtkSourceStyleScheme *scheme = GTK_SOURCE_STYLE_SCHEME (object); - if (scheme->priv->named_colors != NULL) + if (scheme->named_colors != NULL) { - g_hash_table_unref (scheme->priv->named_colors); - scheme->priv->named_colors = NULL; + g_hash_table_unref (scheme->named_colors); + scheme->named_colors = NULL; } - if (scheme->priv->style_cache != NULL) + if (scheme->style_cache != NULL) { - g_hash_table_unref (scheme->priv->style_cache); - scheme->priv->style_cache = NULL; + g_hash_table_unref (scheme->style_cache); + scheme->style_cache = NULL; } - if (scheme->priv->defined_styles != NULL) + if (scheme->defined_styles != NULL) { - g_hash_table_unref (scheme->priv->defined_styles); - scheme->priv->defined_styles = NULL; + g_hash_table_unref (scheme->defined_styles); + scheme->defined_styles = NULL; } - g_clear_object (&scheme->priv->parent); - g_clear_object (&scheme->priv->css_provider); - g_clear_object (&scheme->priv->css_provider_cursors); + g_clear_object (&scheme->parent); + g_clear_object (&scheme->css_provider); + g_clear_object (&scheme->css_provider_cursors); G_OBJECT_CLASS (gtk_source_style_scheme_parent_class)->dispose (object); } @@ -130,33 +133,33 @@ gtk_source_style_scheme_finalize (GObject *object) { GtkSourceStyleScheme *scheme = GTK_SOURCE_STYLE_SCHEME (object); - if (scheme->priv->authors != NULL) + if (scheme->authors != NULL) { - g_ptr_array_free (scheme->priv->authors, TRUE); + g_ptr_array_free (scheme->authors, TRUE); } - g_free (scheme->priv->filename); - g_free (scheme->priv->description); - g_free (scheme->priv->id); - g_free (scheme->priv->name); - g_free (scheme->priv->parent_id); + g_free (scheme->filename); + g_free (scheme->description); + g_free (scheme->id); + g_free (scheme->name); + g_free (scheme->parent_id); G_OBJECT_CLASS (gtk_source_style_scheme_parent_class)->finalize (object); } static void -gtk_source_style_scheme_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +gtk_source_style_scheme_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceStyleScheme *scheme = GTK_SOURCE_STYLE_SCHEME (object); switch (prop_id) { case PROP_ID: - g_free (scheme->priv->id); - scheme->priv->id = g_value_dup_string (value); + g_free (scheme->id); + scheme->id = g_value_dup_string (value); break; default: @@ -166,29 +169,29 @@ gtk_source_style_scheme_set_property (GObject *object, } static void -gtk_source_style_scheme_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +gtk_source_style_scheme_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceStyleScheme *scheme = GTK_SOURCE_STYLE_SCHEME (object); switch (prop_id) { case PROP_ID: - g_value_set_string (value, scheme->priv->id); + g_value_set_string (value, scheme->id); break; case PROP_NAME: - g_value_set_string (value, scheme->priv->name); + g_value_set_string (value, scheme->name); break; case PROP_DESCRIPTION: - g_value_set_string (value, scheme->priv->description); + g_value_set_string (value, scheme->description); break; case PROP_FILENAME: - g_value_set_string (value, scheme->priv->filename); + g_value_set_string (value, scheme->filename); break; default: @@ -273,18 +276,18 @@ unref_if_not_null (gpointer object) static void gtk_source_style_scheme_init (GtkSourceStyleScheme *scheme) { - scheme->priv = gtk_source_style_scheme_get_instance_private (scheme); + scheme = gtk_source_style_scheme_get_instance_private (scheme); - scheme->priv->defined_styles = g_hash_table_new_full (g_str_hash, g_str_equal, + scheme->defined_styles = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); - scheme->priv->style_cache = g_hash_table_new_full (g_str_hash, g_str_equal, + scheme->style_cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, unref_if_not_null); - scheme->priv->named_colors = g_hash_table_new_full (g_str_hash, g_str_equal, + scheme->named_colors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - scheme->priv->css_provider = gtk_css_provider_new (); + scheme->css_provider = gtk_css_provider_new (); } /** @@ -299,9 +302,9 @@ const gchar * gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL); - g_return_val_if_fail (scheme->priv->id != NULL, ""); + g_return_val_if_fail (scheme->id != NULL, ""); - return scheme->priv->id; + return scheme->id; } /** @@ -316,9 +319,9 @@ const gchar * gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL); - g_return_val_if_fail (scheme->priv->name != NULL, ""); + g_return_val_if_fail (scheme->name != NULL, ""); - return scheme->priv->name; + return scheme->name; } /** @@ -334,7 +337,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL); - return scheme->priv->description; + return scheme->description; } /** @@ -352,12 +355,12 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL); - if (scheme->priv->authors == NULL) + if (scheme->authors == NULL) { return NULL; } - return (const gchar * const *)scheme->priv->authors->pdata; + return (const gchar * const *)scheme->authors->pdata; } /** @@ -374,7 +377,7 @@ gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL); - return scheme->priv->filename; + return scheme->filename; } /* @@ -414,7 +417,7 @@ color_parse (const gchar *color, */ static const gchar * get_color_by_name (GtkSourceStyleScheme *scheme, - const gchar *name) + const gchar *name) { const char *color = NULL; @@ -433,11 +436,11 @@ get_color_by_name (GtkSourceStyleScheme *scheme, } else { - color = g_hash_table_lookup (scheme->priv->named_colors, name); + color = g_hash_table_lookup (scheme->named_colors, name); - if (color == NULL && scheme->priv->parent != NULL) + if (color == NULL && scheme->parent != NULL) { - color = get_color_by_name (scheme->priv->parent, name); + color = get_color_by_name (scheme->parent, name); } if (color == NULL) @@ -451,7 +454,7 @@ get_color_by_name (GtkSourceStyleScheme *scheme, static GtkSourceStyle * fix_style_colors (GtkSourceStyleScheme *scheme, - GtkSourceStyle *real_style) + GtkSourceStyle *real_style) { GtkSourceStyle *style; guint i; @@ -493,12 +496,12 @@ fix_style_colors (GtkSourceStyleScheme *scheme, static GtkSourceStyle * gtk_source_style_scheme_get_style_internal (GtkSourceStyleScheme *scheme, - const gchar *style_id) + const gchar *style_id) { GtkSourceStyle *style = NULL; GtkSourceStyle *real_style; - if (g_hash_table_lookup_extended (scheme->priv->style_cache, + if (g_hash_table_lookup_extended (scheme->style_cache, style_id, NULL, (gpointer)&style)) @@ -506,13 +509,13 @@ gtk_source_style_scheme_get_style_internal (GtkSourceStyleScheme *scheme, return style; } - real_style = g_hash_table_lookup (scheme->priv->defined_styles, style_id); + real_style = g_hash_table_lookup (scheme->defined_styles, style_id); if (real_style == NULL) { - if (scheme->priv->parent != NULL) + if (scheme->parent != NULL) { - style = gtk_source_style_scheme_get_style (scheme->priv->parent, + style = gtk_source_style_scheme_get_style (scheme->parent, style_id); } if (style != NULL) @@ -525,7 +528,7 @@ gtk_source_style_scheme_get_style_internal (GtkSourceStyleScheme *scheme, style = fix_style_colors (scheme, real_style); } - g_hash_table_insert (scheme->priv->style_cache, + g_hash_table_insert (scheme->style_cache, g_strdup (style_id), style); @@ -556,7 +559,7 @@ gtk_source_style_scheme_get_style_internal (GtkSourceStyleScheme *scheme, */ GtkSourceStyle * gtk_source_style_scheme_get_style (GtkSourceStyleScheme *scheme, - const gchar *style_id) + const gchar *style_id) { GtkSourceStyle *style; @@ -617,8 +620,8 @@ _gtk_source_style_scheme_get_draw_spaces_style (GtkSourceStyleScheme *scheme) static gboolean get_color (GtkSourceStyle *style, - gboolean foreground, - GdkRGBA *dest) + gboolean foreground, + GdkRGBA *dest) { const gchar *color; guint mask; @@ -657,7 +660,7 @@ get_color (GtkSourceStyle *style, */ gboolean _gtk_source_style_scheme_get_current_line_color (GtkSourceStyleScheme *scheme, - GdkRGBA *color) + GdkRGBA *color) { GtkSourceStyle *style; @@ -688,7 +691,7 @@ _gtk_source_style_scheme_get_background_pattern_color (GtkSourceStyleScheme *sch static gchar * get_cursors_css_style (GtkSourceStyleScheme *scheme, - GtkWidget *widget) + GtkWidget *widget) { GtkSourceStyle *primary_style; GtkSourceStyle *secondary_style; @@ -771,7 +774,7 @@ get_cursors_css_style (GtkSourceStyleScheme *scheme, */ static GtkCssProvider * get_css_provider_cursors (GtkSourceStyleScheme *scheme, - GtkWidget *widget) + GtkWidget *widget) { gchar *css; GtkCssProvider *provider; @@ -810,7 +813,7 @@ get_css_provider_cursors (GtkSourceStyleScheme *scheme, */ void _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme, - GtkSourceView *view) + GtkSourceView *view) { GtkStyleContext *context; @@ -819,7 +822,7 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme, context = gtk_widget_get_style_context (GTK_WIDGET (view)); gtk_style_context_add_provider (context, - GTK_STYLE_PROVIDER (scheme->priv->css_provider), + GTK_STYLE_PROVIDER (scheme->css_provider), GTK_SOURCE_STYLE_PROVIDER_PRIORITY); G_GNUC_BEGIN_IGNORE_DEPRECATIONS; @@ -830,16 +833,16 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme, /* The CssProvider for the cursors needs that the first provider is * applied, to get the background color. */ - if (scheme->priv->css_provider_cursors == NULL) + if (scheme->css_provider_cursors == NULL) { - scheme->priv->css_provider_cursors = get_css_provider_cursors (scheme, + scheme->css_provider_cursors = get_css_provider_cursors (scheme, GTK_WIDGET (view)); } - if (scheme->priv->css_provider_cursors != NULL) + if (scheme->css_provider_cursors != NULL) { gtk_style_context_add_provider (context, - GTK_STYLE_PROVIDER (scheme->priv->css_provider_cursors), + GTK_STYLE_PROVIDER (scheme->css_provider_cursors), GTK_SOURCE_STYLE_PROVIDER_PRIORITY); G_GNUC_BEGIN_IGNORE_DEPRECATIONS; @@ -859,7 +862,7 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme, */ void _gtk_source_style_scheme_unapply (GtkSourceStyleScheme *scheme, - GtkSourceView *view) + GtkSourceView *view) { GtkStyleContext *context; @@ -868,12 +871,12 @@ _gtk_source_style_scheme_unapply (GtkSourceStyleScheme *scheme, context = gtk_widget_get_style_context (GTK_WIDGET (view)); gtk_style_context_remove_provider (context, - GTK_STYLE_PROVIDER (scheme->priv->css_provider)); + GTK_STYLE_PROVIDER (scheme->css_provider)); - if (scheme->priv->css_provider_cursors != NULL) + if (scheme->css_provider_cursors != NULL) { gtk_style_context_remove_provider (context, - GTK_STYLE_PROVIDER (scheme->priv->css_provider_cursors)); + GTK_STYLE_PROVIDER (scheme->css_provider_cursors)); } G_GNUC_BEGIN_IGNORE_DEPRECATIONS; @@ -996,7 +999,7 @@ generate_css_style (GtkSourceStyleScheme *scheme) { GError *error = NULL; - gtk_css_provider_load_from_data (scheme->priv->css_provider, + gtk_css_provider_load_from_data (scheme->css_provider, final_style->str, final_style->len, &error); @@ -1021,10 +1024,10 @@ parse_bool (char *value) static void get_bool (xmlNode *node, - const char *propname, - guint *mask, - guint mask_value, - gboolean *value) + const char *propname, + guint *mask, + guint mask_value, + gboolean *value) { xmlChar *tmp = xmlGetProp (node, BAD_CAST propname); @@ -1038,11 +1041,11 @@ get_bool (xmlNode *node, } static gboolean -parse_style (GtkSourceStyleScheme *scheme, - xmlNode *node, - gchar **style_name_p, - GtkSourceStyle **style_p, - GError **error) +parse_style (GtkSourceStyleScheme *scheme, + xmlNode *node, + gchar **style_name_p, + GtkSourceStyle **style_p, + GError **error) { GtkSourceStyle *use_style = NULL; GtkSourceStyle *result = NULL; @@ -1209,9 +1212,9 @@ parse_style (GtkSourceStyleScheme *scheme, } static gboolean -parse_color (GtkSourceStyleScheme *scheme, - xmlNode *node, - GError **error) +parse_color (GtkSourceStyleScheme *scheme, + xmlNode *node, + GError **error) { xmlChar *name, *value; gboolean result = FALSE; @@ -1225,13 +1228,13 @@ parse_color (GtkSourceStyleScheme *scheme, g_set_error (error, ERROR_QUARK, 0, "value attribute missing in 'color' tag"); else if (value[0] != '#' || value[1] == 0) g_set_error (error, ERROR_QUARK, 0, "value in 'color' tag is not of the form '#RGB' or '#name'"); - else if (g_hash_table_lookup (scheme->priv->named_colors, name) != NULL) + else if (g_hash_table_lookup (scheme->named_colors, name) != NULL) g_set_error (error, ERROR_QUARK, 0, "duplicated color '%s'", name); else result = TRUE; if (result) - g_hash_table_insert (scheme->priv->named_colors, + g_hash_table_insert (scheme->named_colors, g_strdup ((char *) name), g_strdup ((char *) value)); @@ -1242,9 +1245,9 @@ parse_color (GtkSourceStyleScheme *scheme, } static gboolean -parse_style_scheme_child (GtkSourceStyleScheme *scheme, - xmlNode *node, - GError **error) +parse_style_scheme_child (GtkSourceStyleScheme *scheme, + xmlNode *node, + GError **error) { if (strcmp ((char*) node->name, "style") == 0) { @@ -1254,7 +1257,7 @@ parse_style_scheme_child (GtkSourceStyleScheme *scheme, if (!parse_style (scheme, node, &style_name, &style, error)) return FALSE; - g_hash_table_insert (scheme->priv->defined_styles, style_name, style); + g_hash_table_insert (scheme->defined_styles, style_name, style); } else if (strcmp ((char*) node->name, "color") == 0) { @@ -1264,23 +1267,23 @@ parse_style_scheme_child (GtkSourceStyleScheme *scheme, else if (strcmp ((char*) node->name, "author") == 0) { xmlChar *tmp = xmlNodeGetContent (node); - if (scheme->priv->authors == NULL) - scheme->priv->authors = g_ptr_array_new_with_free_func (g_free); + if (scheme->authors == NULL) + scheme->authors = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (scheme->priv->authors, g_strdup ((char*) tmp)); + g_ptr_array_add (scheme->authors, g_strdup ((char*) tmp)); xmlFree (tmp); } else if (strcmp ((char*) node->name, "description") == 0) { xmlChar *tmp = xmlNodeGetContent (node); - scheme->priv->description = g_strdup ((char*) tmp); + scheme->description = g_strdup ((char*) tmp); xmlFree (tmp); } else if (strcmp ((char*) node->name, "_description") == 0) { xmlChar *tmp = xmlNodeGetContent (node); - scheme->priv->description = g_strdup (_((char*) tmp)); + scheme->description = g_strdup (_((char*) tmp)); xmlFree (tmp); } else @@ -1293,9 +1296,9 @@ parse_style_scheme_child (GtkSourceStyleScheme *scheme, } static void -parse_style_scheme_element (GtkSourceStyleScheme *scheme, - xmlNode *scheme_node, - GError **error) +parse_style_scheme_element (GtkSourceStyleScheme *scheme, + xmlNode *scheme_node, + GError **error) { xmlChar *tmp; xmlNode *node; @@ -1328,14 +1331,14 @@ parse_style_scheme_element (GtkSourceStyleScheme *scheme, g_set_error (error, ERROR_QUARK, 0, "missing 'id' attribute"); return; } - scheme->priv->id = g_strdup ((char*) tmp); + scheme->id = g_strdup ((char*) tmp); xmlFree (tmp); tmp = xmlGetProp (scheme_node, BAD_CAST "_name"); if (tmp != NULL) - scheme->priv->name = g_strdup (_((char*) tmp)); + scheme->name = g_strdup (_((char*) tmp)); else if ((tmp = xmlGetProp (scheme_node, BAD_CAST "name")) != NULL) - scheme->priv->name = g_strdup ((char*) tmp); + scheme->name = g_strdup ((char*) tmp); else { g_set_error (error, ERROR_QUARK, 0, "missing 'name' attribute"); @@ -1345,7 +1348,7 @@ parse_style_scheme_element (GtkSourceStyleScheme *scheme, tmp = xmlGetProp (scheme_node, BAD_CAST "parent-scheme"); if (tmp != NULL) - scheme->priv->parent_id = g_strdup ((char*) tmp); + scheme->parent_id = g_strdup ((char*) tmp); xmlFree (tmp); for (node = scheme_node->children; node != NULL; node = node->next) @@ -1354,8 +1357,8 @@ parse_style_scheme_element (GtkSourceStyleScheme *scheme, return; /* NULL-terminate the array of authors */ - if (scheme->priv->authors != NULL) - g_ptr_array_add (scheme->priv->authors, NULL); + if (scheme->authors != NULL) + g_ptr_array_add (scheme->authors, NULL); } /** @@ -1413,7 +1416,7 @@ _gtk_source_style_scheme_new_from_file (const gchar *filename) } scheme = g_object_new (GTK_SOURCE_TYPE_STYLE_SCHEME, NULL); - scheme->priv->filename = g_strdup (filename); + scheme->filename = g_strdup (filename); parse_style_scheme_element (scheme, node, &error); @@ -1451,7 +1454,7 @@ _gtk_source_style_scheme_get_parent_id (GtkSourceStyleScheme *scheme) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL); - return scheme->priv->parent_id; + return scheme->parent_id; } /** @@ -1467,27 +1470,27 @@ _gtk_source_style_scheme_get_parent_id (GtkSourceStyleScheme *scheme) */ void _gtk_source_style_scheme_set_parent (GtkSourceStyleScheme *scheme, - GtkSourceStyleScheme *parent_scheme) + GtkSourceStyleScheme *parent_scheme) { g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme)); g_return_if_fail (parent_scheme == NULL || GTK_SOURCE_IS_STYLE_SCHEME (parent_scheme)); - if (scheme->priv->parent == parent_scheme) + if (scheme->parent == parent_scheme) { return; } - g_clear_object (&scheme->priv->parent); + g_clear_object (&scheme->parent); if (parent_scheme != NULL) { g_object_ref (parent_scheme); } - scheme->priv->parent = parent_scheme; + scheme->parent = parent_scheme; /* Update CSS based on parent styles */ - g_hash_table_remove_all (scheme->priv->style_cache); + g_hash_table_remove_all (scheme->style_cache); generate_css_style (scheme); } diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h index adc28f8c..a4d2aa6f 100644 --- a/gtksourceview/gtksourcestylescheme.h +++ b/gtksourceview/gtksourcestylescheme.h @@ -29,88 +29,50 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_STYLE_SCHEME (gtk_source_style_scheme_get_type ()) -#define GTK_SOURCE_STYLE_SCHEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleScheme)) -#define GTK_SOURCE_STYLE_SCHEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleSchemeClass)) -#define GTK_SOURCE_IS_STYLE_SCHEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME)) -#define GTK_SOURCE_IS_STYLE_SCHEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME)) -#define GTK_SOURCE_STYLE_SCHEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleSchemeClass)) - -typedef struct _GtkSourceStyleSchemePrivate GtkSourceStyleSchemePrivate; -typedef struct _GtkSourceStyleSchemeClass GtkSourceStyleSchemeClass; - -struct _GtkSourceStyleScheme -{ - GObject base; - GtkSourceStyleSchemePrivate *priv; -}; - -struct _GtkSourceStyleSchemeClass -{ - GObjectClass base_class; - - /* Padding for future expansion */ - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_STYLE_SCHEME (gtk_source_style_scheme_get_type()) GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_style_scheme_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceStyleScheme, gtk_source_style_scheme, GTK_SOURCE, STYLE_SCHEME, GObject) GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme); - +const gchar *gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme); - +const gchar *gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme); - +const gchar *gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar * const * gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); - +const gchar * const *gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar *gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme); - +const gchar *gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceStyle *gtk_source_style_scheme_get_style (GtkSourceStyleScheme *scheme, - const gchar *style_id); - +GtkSourceStyle *gtk_source_style_scheme_get_style (GtkSourceStyleScheme *scheme, + const gchar *style_id); G_GNUC_INTERNAL -GtkSourceStyleScheme *_gtk_source_style_scheme_new_from_file (const gchar *filename); - +GtkSourceStyleScheme *_gtk_source_style_scheme_new_from_file (const gchar *filename); G_GNUC_INTERNAL -GtkSourceStyleScheme *_gtk_source_style_scheme_get_default (void); - +GtkSourceStyleScheme *_gtk_source_style_scheme_get_default (void); G_GNUC_INTERNAL -const gchar *_gtk_source_style_scheme_get_parent_id (GtkSourceStyleScheme *scheme); - +const gchar *_gtk_source_style_scheme_get_parent_id (GtkSourceStyleScheme *scheme); G_GNUC_INTERNAL -void _gtk_source_style_scheme_set_parent (GtkSourceStyleScheme *scheme, - GtkSourceStyleScheme *parent_scheme); - +void _gtk_source_style_scheme_set_parent (GtkSourceStyleScheme *scheme, + GtkSourceStyleScheme *parent_scheme); G_GNUC_INTERNAL -void _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme, - GtkSourceView *view); - +void _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme, + GtkSourceView *view); G_GNUC_INTERNAL -void _gtk_source_style_scheme_unapply (GtkSourceStyleScheme *scheme, - GtkSourceView *view); - +void _gtk_source_style_scheme_unapply (GtkSourceStyleScheme *scheme, + GtkSourceView *view); G_GNUC_INTERNAL -GtkSourceStyle *_gtk_source_style_scheme_get_matching_brackets_style (GtkSourceStyleScheme *scheme); - +GtkSourceStyle *_gtk_source_style_scheme_get_matching_brackets_style (GtkSourceStyleScheme *scheme); G_GNUC_INTERNAL -GtkSourceStyle *_gtk_source_style_scheme_get_right_margin_style (GtkSourceStyleScheme *scheme); - +GtkSourceStyle *_gtk_source_style_scheme_get_right_margin_style (GtkSourceStyleScheme *scheme); G_GNUC_INTERNAL -GtkSourceStyle *_gtk_source_style_scheme_get_draw_spaces_style (GtkSourceStyleScheme *scheme); - +GtkSourceStyle *_gtk_source_style_scheme_get_draw_spaces_style (GtkSourceStyleScheme *scheme); G_GNUC_INTERNAL -gboolean _gtk_source_style_scheme_get_current_line_color (GtkSourceStyleScheme *scheme, - GdkRGBA *color); - +gboolean _gtk_source_style_scheme_get_current_line_color (GtkSourceStyleScheme *scheme, + GdkRGBA *color); G_GNUC_INTERNAL -gboolean _gtk_source_style_scheme_get_background_pattern_color (GtkSourceStyleScheme *scheme, - GdkRGBA *color); +gboolean _gtk_source_style_scheme_get_background_pattern_color (GtkSourceStyleScheme *scheme, + GdkRGBA *color); G_END_DECLS -- GitLab From 0f26f97491fdd88bdad53e226365d65c04c52c45 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 10:50:01 -0800 Subject: [PATCH 034/248] scheme: modernize GtkSourceStyleSchemeManager - Use G_DECLARE - Make final - Fix multi-line function indentation --- gtksourceview/gtksourcestyleschememanager.c | 123 ++++++++++---------- gtksourceview/gtksourcestyleschememanager.h | 67 +++-------- 2 files changed, 80 insertions(+), 110 deletions(-) diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c index 9a50c6b7..47375ec4 100644 --- a/gtksourceview/gtksourcestyleschememanager.c +++ b/gtksourceview/gtksourcestyleschememanager.c @@ -20,8 +20,9 @@ #include "config.h" -#include "gtksourcestyleschememanager.h" #include + +#include "gtksourcestyleschememanager.h" #include "gtksourcestylescheme.h" #include "gtksourceutils-private.h" @@ -37,8 +38,10 @@ #define SCHEME_FILE_SUFFIX ".xml" #define STYLES_DIR "styles" -struct _GtkSourceStyleSchemeManagerPrivate +struct _GtkSourceStyleSchemeManager { + GObject parent_instance; + GHashTable *schemes_hash; gchar **search_path; @@ -55,13 +58,13 @@ enum { static GtkSourceStyleSchemeManager *default_instance; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceStyleSchemeManager, gtk_source_style_scheme_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE (GtkSourceStyleSchemeManager, gtk_source_style_scheme_manager, G_TYPE_OBJECT) static void -gtk_source_style_scheme_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +gtk_source_style_scheme_manager_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceStyleSchemeManager *sm; @@ -84,9 +87,9 @@ gtk_source_style_scheme_manager_set_property (GObject *object, static void gtk_source_style_scheme_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceStyleSchemeManager *sm; @@ -115,14 +118,14 @@ gtk_source_style_scheme_manager_get_property (GObject *object, static void free_schemes (GtkSourceStyleSchemeManager *mgr) { - if (mgr->priv->schemes_hash != NULL) + if (mgr->schemes_hash != NULL) { - g_hash_table_destroy (mgr->priv->schemes_hash); - mgr->priv->schemes_hash = NULL; + g_hash_table_destroy (mgr->schemes_hash); + mgr->schemes_hash = NULL; } - g_strfreev (mgr->priv->ids); - mgr->priv->ids = NULL; + g_strfreev (mgr->ids); + mgr->ids = NULL; } static void @@ -134,7 +137,7 @@ gtk_source_style_scheme_manager_finalize (GObject *object) free_schemes (mgr); - g_strfreev (mgr->priv->search_path); + g_strfreev (mgr->search_path); G_OBJECT_CLASS (gtk_source_style_scheme_manager_parent_class)->finalize (object); } @@ -168,11 +171,11 @@ gtk_source_style_scheme_manager_class_init (GtkSourceStyleSchemeManagerClass *kl static void gtk_source_style_scheme_manager_init (GtkSourceStyleSchemeManager *mgr) { - mgr->priv = gtk_source_style_scheme_manager_get_instance_private (mgr); - mgr->priv->schemes_hash = NULL; - mgr->priv->ids = NULL; - mgr->priv->search_path = NULL; - mgr->priv->need_reload = TRUE; + mgr = gtk_source_style_scheme_manager_get_instance_private (mgr); + mgr->schemes_hash = NULL; + mgr->ids = NULL; + mgr->search_path = NULL; + mgr->need_reload = TRUE; } /** @@ -217,9 +220,9 @@ _gtk_source_style_scheme_manager_peek_default (void) } static gboolean -build_reference_chain (GtkSourceStyleScheme *scheme, - GHashTable *hash, - GSList **ret) +build_reference_chain (GtkSourceStyleScheme *scheme, + GHashTable *hash, + GSList **ret) { GSList *chain; gboolean retval = TRUE; @@ -265,7 +268,8 @@ build_reference_chain (GtkSourceStyleScheme *scheme, } static GSList * -check_parents (GSList *schemes, GHashTable *hash) +check_parents (GSList *schemes, + GHashTable *hash) { GSList *to_check; @@ -302,7 +306,8 @@ check_parents (GSList *schemes, GHashTable *hash) } static gint -schemes_compare (GtkSourceStyleScheme *scheme1, GtkSourceStyleScheme *scheme2) +schemes_compare (GtkSourceStyleScheme *scheme1, + GtkSourceStyleScheme *scheme2) { const gchar *name1; const gchar *name2; @@ -341,7 +346,7 @@ reload_if_needed (GtkSourceStyleSchemeManager *mgr) GSList *l; GHashTable *schemes_hash; - if (!mgr->priv->need_reload) + if (!mgr->need_reload) return; schemes_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); @@ -384,17 +389,17 @@ reload_if_needed (GtkSourceStyleSchemeManager *mgr) free_schemes (mgr); - mgr->priv->need_reload = FALSE; - mgr->priv->schemes_hash = schemes_hash; + mgr->need_reload = FALSE; + mgr->schemes_hash = schemes_hash; - mgr->priv->ids = schemes_list_to_ids (schemes); + mgr->ids = schemes_list_to_ids (schemes); g_slist_free (schemes); } static void notify_search_path (GtkSourceStyleSchemeManager *mgr) { - mgr->priv->need_reload = TRUE; + mgr->need_reload = TRUE; g_object_notify (G_OBJECT (mgr), "search-path"); g_object_notify (G_OBJECT (mgr), "scheme-ids"); @@ -412,18 +417,18 @@ notify_search_path (GtkSourceStyleSchemeManager *mgr) */ void gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *manager, - gchar **path) + gchar **path) { gchar **tmp; g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager)); - tmp = manager->priv->search_path; + tmp = manager->search_path; if (path == NULL) - manager->priv->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); + manager->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); else - manager->priv->search_path = g_strdupv (path); + manager->search_path = g_strdupv (path); g_strfreev (tmp); @@ -441,26 +446,26 @@ gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *m */ void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path) + const gchar *path) { guint len = 0; g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager)); g_return_if_fail (path != NULL); - if (manager->priv->search_path == NULL) - manager->priv->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); + if (manager->search_path == NULL) + manager->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); - g_return_if_fail (manager->priv->search_path != NULL); + g_return_if_fail (manager->search_path != NULL); - len = g_strv_length (manager->priv->search_path); + len = g_strv_length (manager->search_path); - manager->priv->search_path = g_renew (gchar *, - manager->priv->search_path, + manager->search_path = g_renew (gchar *, + manager->search_path, len + 2); /* old path + new entry + NULL */ - manager->priv->search_path[len] = g_strdup (path); - manager->priv->search_path[len + 1] = NULL; + manager->search_path[len] = g_strdup (path); + manager->search_path[len + 1] = NULL; notify_search_path (manager); } @@ -476,7 +481,7 @@ gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSchemeManager */ void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path) + const gchar *path) { guint len = 0; gchar **new_search_path; @@ -484,19 +489,19 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager)); g_return_if_fail (path != NULL); - if (manager->priv->search_path == NULL) - manager->priv->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); + if (manager->search_path == NULL) + manager->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); - g_return_if_fail (manager->priv->search_path != NULL); + g_return_if_fail (manager->search_path != NULL); - len = g_strv_length (manager->priv->search_path); + len = g_strv_length (manager->search_path); new_search_path = g_new (gchar *, len + 2); new_search_path[0] = g_strdup (path); - memcpy (new_search_path + 1, manager->priv->search_path, (len + 1) * sizeof (gchar*)); + memcpy (new_search_path + 1, manager->search_path, (len + 1) * sizeof (gchar*)); - g_free (manager->priv->search_path); - manager->priv->search_path = new_search_path; + g_free (manager->search_path); + manager->search_path = new_search_path; notify_search_path (manager); } @@ -517,10 +522,10 @@ gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *ma { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager), NULL); - if (manager->priv->search_path == NULL) - manager->priv->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); + if (manager->search_path == NULL) + manager->search_path = _gtk_source_utils_get_default_dirs (STYLES_DIR); - return (const gchar * const *)manager->priv->search_path; + return (const gchar * const *)manager->search_path; } /** @@ -536,7 +541,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag { g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager)); - manager->priv->need_reload = TRUE; + manager->need_reload = TRUE; g_object_notify (G_OBJECT (manager), "scheme-ids"); } @@ -560,7 +565,7 @@ gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *man reload_if_needed (manager); - return (const gchar * const *)manager->priv->ids; + return (const gchar * const *)manager->ids; } /** @@ -575,12 +580,12 @@ gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *man */ GtkSourceStyleScheme * gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager, - const gchar *scheme_id) + const gchar *scheme_id) { g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager), NULL); g_return_val_if_fail (scheme_id != NULL, NULL); reload_if_needed (manager); - return g_hash_table_lookup (manager->priv->schemes_hash, scheme_id); + return g_hash_table_lookup (manager->schemes_hash, scheme_id); } diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h index 3a13a9c4..628e9b77 100644 --- a/gtksourceview/gtksourcestyleschememanager.h +++ b/gtksourceview/gtksourcestyleschememanager.h @@ -29,69 +29,34 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER (gtk_source_style_scheme_manager_get_type ()) -#define GTK_SOURCE_STYLE_SCHEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManager)) -#define GTK_SOURCE_STYLE_SCHEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass)) -#define GTK_SOURCE_IS_STYLE_SCHEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER)) -#define GTK_SOURCE_IS_STYLE_SCHEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER)) -#define GTK_SOURCE_STYLE_SCHEME_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass)) - -typedef struct _GtkSourceStyleSchemeManagerClass GtkSourceStyleSchemeManagerClass; -typedef struct _GtkSourceStyleSchemeManagerPrivate GtkSourceStyleSchemeManagerPrivate; - -struct _GtkSourceStyleSchemeManager -{ - GObject parent; - - GtkSourceStyleSchemeManagerPrivate *priv; -}; - -struct _GtkSourceStyleSchemeManagerClass -{ - GObjectClass parent_class; - - /* Padding for future expansion */ - gpointer padding[10]; -}; +#define GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER (gtk_source_style_scheme_manager_get_type()) GTK_SOURCE_AVAILABLE_IN_ALL -GType gtk_source_style_scheme_manager_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (GtkSourceStyleSchemeManager, gtk_source_style_scheme_manager, GTK_SOURCE, STYLE_SCHEME_MANAGER, GObject) GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceStyleSchemeManager * - gtk_source_style_scheme_manager_new (void); - +GtkSourceStyleSchemeManager *gtk_source_style_scheme_manager_new (void); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceStyleSchemeManager * - gtk_source_style_scheme_manager_get_default (void); - +GtkSourceStyleSchemeManager *gtk_source_style_scheme_manager_get_default (void); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *manager, - gchar **path); - +void gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *manager, + gchar **path); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path); - +void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSchemeManager *manager, + const gchar *path); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path); - +void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager, + const gchar *path); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar * const * gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); - +const gchar * const *gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager); - +void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager); GTK_SOURCE_AVAILABLE_IN_ALL -const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); - +const gchar * const *gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceStyleScheme *gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager, - const gchar *scheme_id); - +GtkSourceStyleScheme *gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager, + const gchar *scheme_id); G_GNUC_INTERNAL -GtkSourceStyleSchemeManager * - _gtk_source_style_scheme_manager_peek_default (void); +GtkSourceStyleSchemeManager *_gtk_source_style_scheme_manager_peek_default (void); G_END_DECLS -- GitLab From 6ce06c0fb24e66a082afd53a2128343d6e646bfd Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 11:25:34 -0800 Subject: [PATCH 035/248] buffer: modernize GtkSourceBufferInternal --- gtksourceview/gtksourcebufferinternal.c | 2 +- gtksourceview/gtksourcebufferinternal.h | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gtksourceview/gtksourcebufferinternal.c b/gtksourceview/gtksourcebufferinternal.c index 08b82642..e55c5fff 100644 --- a/gtksourceview/gtksourcebufferinternal.c +++ b/gtksourceview/gtksourcebufferinternal.c @@ -111,7 +111,7 @@ _gtk_source_buffer_internal_get_from_buffer (GtkSourceBuffer *buffer) void _gtk_source_buffer_internal_emit_search_start (GtkSourceBufferInternal *buffer_internal, - GtkSourceSearchContext *search_context) + GtkSourceSearchContext *search_context) { g_return_if_fail (GTK_SOURCE_IS_BUFFER_INTERNAL (buffer_internal)); g_return_if_fail (GTK_SOURCE_IS_SEARCH_CONTEXT (search_context)); diff --git a/gtksourceview/gtksourcebufferinternal.h b/gtksourceview/gtksourcebufferinternal.h index 55ce0907..cf6e3759 100644 --- a/gtksourceview/gtksourcebufferinternal.h +++ b/gtksourceview/gtksourcebufferinternal.h @@ -26,19 +26,15 @@ G_BEGIN_DECLS -#define GTK_SOURCE_TYPE_BUFFER_INTERNAL (_gtk_source_buffer_internal_get_type ()) +#define GTK_SOURCE_TYPE_BUFFER_INTERNAL (_gtk_source_buffer_internal_get_type()) G_GNUC_INTERNAL -G_DECLARE_FINAL_TYPE (GtkSourceBufferInternal, _gtk_source_buffer_internal, - GTK_SOURCE, BUFFER_INTERNAL, - GObject) +G_DECLARE_FINAL_TYPE (GtkSourceBufferInternal, _gtk_source_buffer_internal, GTK_SOURCE, BUFFER_INTERNAL, GObject) G_GNUC_INTERNAL -GtkSourceBufferInternal * - _gtk_source_buffer_internal_get_from_buffer (GtkSourceBuffer *buffer); - +GtkSourceBufferInternal *_gtk_source_buffer_internal_get_from_buffer (GtkSourceBuffer *buffer); G_GNUC_INTERNAL -void _gtk_source_buffer_internal_emit_search_start (GtkSourceBufferInternal *buffer_internal, - GtkSourceSearchContext *search_context); +void _gtk_source_buffer_internal_emit_search_start (GtkSourceBufferInternal *buffer_internal, + GtkSourceSearchContext *search_context); G_END_DECLS -- GitLab From 1a689fc597f004b6dac32656f1339fb5d024876f Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 11:23:09 -0800 Subject: [PATCH 036/248] buffer: modernize GtkSourceBufferInputStream - Use G_DECLARE_ - Make final - Use private header --- docs/reference/meson.build | 2 +- .../gtksourcebufferinputstream-private.h | 47 +++++++ gtksourceview/gtksourcebufferinputstream.c | 121 +++++++++--------- gtksourceview/gtksourcebufferinputstream.h | 69 ---------- gtksourceview/gtksourcefilesaver.c | 2 +- gtksourceview/gtksourcetypes-private.h | 4 +- testsuite/test-buffer-input-stream.c | 3 +- 7 files changed, 115 insertions(+), 133 deletions(-) create mode 100644 gtksourceview/gtksourcebufferinputstream-private.h delete mode 100644 gtksourceview/gtksourcebufferinputstream.h diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 4f3a3619..372262b4 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -8,7 +8,7 @@ reference_private_h = [ 'config.h', 'gtksource.h', 'gtksourcebuffer-private.h', - 'gtksourcebufferinputstream.h', + 'gtksourcebufferinputstream-private.h', 'gtksourcebufferinternal.h', 'gtksourcebufferoutputstream.h', 'gtksourcecompletioncontainer.h', diff --git a/gtksourceview/gtksourcebufferinputstream-private.h b/gtksourceview/gtksourcebufferinputstream-private.h new file mode 100644 index 00000000..571c947e --- /dev/null +++ b/gtksourceview/gtksourcebufferinputstream-private.h @@ -0,0 +1,47 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- */ +/* + * This file is part of GtkSourceView + * + * Copyright 2010 - Ignacio Casal Quinteiro + * Copyright 2014 - Sébastien Wilmet + * + * GtkSourceView is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * GtkSourceView is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see . + */ + +#pragma once + +#include +#include + +#include "gtksourcetypes-private.h" +#include "gtksourcebuffer.h" +#include "gtksourcefile.h" + +G_BEGIN_DECLS + +#define GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM (_gtk_source_buffer_input_stream_get_type()) + +GTK_SOURCE_INTERNAL +G_DECLARE_FINAL_TYPE (GtkSourceBufferInputStream, _gtk_source_buffer_input_stream, GTK_SOURCE, BUFFER_INPUT_STREAM, GInputStream) + +GTK_SOURCE_INTERNAL +GtkSourceBufferInputStream *_gtk_source_buffer_input_stream_new (GtkTextBuffer *buffer, + GtkSourceNewlineType type, + gboolean add_trailing_newline); +GTK_SOURCE_INTERNAL +gsize _gtk_source_buffer_input_stream_get_total_size (GtkSourceBufferInputStream *stream); +GTK_SOURCE_INTERNAL +gsize _gtk_source_buffer_input_stream_tell (GtkSourceBufferInputStream *stream); + +G_END_DECLS diff --git a/gtksourceview/gtksourcebufferinputstream.c b/gtksourceview/gtksourcebufferinputstream.c index ec984607..a8d9be86 100644 --- a/gtksourceview/gtksourcebufferinputstream.c +++ b/gtksourceview/gtksourcebufferinputstream.c @@ -24,7 +24,8 @@ #include #include #include -#include "gtksourcebufferinputstream.h" + +#include "gtksourcebufferinputstream-private.h" #include "gtksource-enumtypes.h" /* NOTE: never use async methods on this stream, the stream is just @@ -34,8 +35,10 @@ * thread. */ -struct _GtkSourceBufferInputStreamPrivate +struct _GtkSourceBufferInputStream { + GInputStream parent_instance; + GtkTextBuffer *buffer; GtkTextMark *pos; gint bytes_partial; @@ -55,12 +58,12 @@ enum PROP_ADD_TRAILING_NEWLINE }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkSourceBufferInputStream, _gtk_source_buffer_input_stream, G_TYPE_INPUT_STREAM); +G_DEFINE_TYPE (GtkSourceBufferInputStream, _gtk_source_buffer_input_stream, G_TYPE_INPUT_STREAM) static gsize get_new_line_size (GtkSourceBufferInputStream *stream) { - switch (stream->priv->newline_type) + switch (stream->newline_type) { case GTK_SOURCE_NEWLINE_TYPE_CR: case GTK_SOURCE_NEWLINE_TYPE_LF: @@ -80,7 +83,7 @@ get_new_line_size (GtkSourceBufferInputStream *stream) static const gchar * get_new_line (GtkSourceBufferInputStream *stream) { - switch (stream->priv->newline_type) + switch (stream->newline_type) { case GTK_SOURCE_NEWLINE_TYPE_LF: return "\n"; @@ -101,8 +104,8 @@ get_new_line (GtkSourceBufferInputStream *stream) static gsize read_line (GtkSourceBufferInputStream *stream, - gchar *outbuf, - gsize space_left) + gchar *outbuf, + gsize space_left) { GtkTextIter start, next, end; gchar *buf; @@ -111,14 +114,14 @@ read_line (GtkSourceBufferInputStream *stream, const gchar *newline; gboolean is_last; - if (stream->priv->buffer == NULL) + if (stream->buffer == NULL) { return 0; } - gtk_text_buffer_get_iter_at_mark (stream->priv->buffer, + gtk_text_buffer_get_iter_at_mark (stream->buffer, &start, - stream->priv->pos); + stream->pos); if (gtk_text_iter_is_end (&start)) { @@ -140,7 +143,7 @@ read_line (GtkSourceBufferInputStream *stream, /* the bytes of a line includes also the newline, so with the offsets we remove the newline and we add the new newline size */ - bytes = gtk_text_iter_get_bytes_in_line (&start) - stream->priv->bytes_partial; + bytes = gtk_text_iter_get_bytes_in_line (&start) - stream->bytes_partial; /* bytes_in_line includes the newlines, so we remove that assuming that they are single byte characters */ @@ -198,7 +201,7 @@ read_line (GtkSourceBufferInputStream *stream, /* Note: offset is one past what we wrote */ gtk_text_iter_forward_chars (&start, char_offset); - stream->priv->bytes_partial += written; + stream->bytes_partial += written; read = written; } else @@ -213,12 +216,12 @@ read_line (GtkSourceBufferInputStream *stream, } start = next; - stream->priv->bytes_partial = 0; + stream->bytes_partial = 0; read = bytes_to_write; } - gtk_text_buffer_move_mark (stream->priv->buffer, - stream->priv->pos, + gtk_text_buffer_move_mark (stream->buffer, + stream->pos, &start); g_free (buf); @@ -227,10 +230,10 @@ read_line (GtkSourceBufferInputStream *stream, static gssize _gtk_source_buffer_input_stream_read (GInputStream *input_stream, - void *buffer, - gsize count, - GCancellable *cancellable, - GError **error) + void *buffer, + gsize count, + GCancellable *cancellable, + GError **error) { GtkSourceBufferInputStream *stream; GtkTextIter iter; @@ -250,21 +253,21 @@ _gtk_source_buffer_input_stream_read (GInputStream *input_stream, return -1; } - if (stream->priv->buffer == NULL) + if (stream->buffer == NULL) { return 0; } /* Initialize the mark to the first char in the text buffer */ - if (!stream->priv->is_initialized) + if (!stream->is_initialized) { - gtk_text_buffer_get_start_iter (stream->priv->buffer, &iter); - stream->priv->pos = gtk_text_buffer_create_mark (stream->priv->buffer, + gtk_text_buffer_get_start_iter (stream->buffer, &iter); + stream->pos = gtk_text_buffer_create_mark (stream->buffer, NULL, &iter, FALSE); - stream->priv->is_initialized = TRUE; + stream->is_initialized = TRUE; } space_left = count; @@ -275,24 +278,24 @@ _gtk_source_buffer_input_stream_read (GInputStream *input_stream, n = read_line (stream, (gchar *)buffer + read, space_left); read += n; space_left -= n; - } while (space_left > 0 && n != 0 && stream->priv->bytes_partial == 0); + } while (space_left > 0 && n != 0 && stream->bytes_partial == 0); /* Make sure that non-empty files are always terminated with \n (see bug #95676). * Note that we strip the trailing \n when loading the file */ - gtk_text_buffer_get_iter_at_mark (stream->priv->buffer, + gtk_text_buffer_get_iter_at_mark (stream->buffer, &iter, - stream->priv->pos); + stream->pos); if (gtk_text_iter_is_end (&iter) && !gtk_text_iter_is_start (&iter) && - stream->priv->add_trailing_newline) + stream->add_trailing_newline) { gssize newline_size; newline_size = get_new_line_size (stream); if (space_left >= newline_size && - !stream->priv->newline_added) + !stream->newline_added) { const gchar *newline; @@ -301,7 +304,7 @@ _gtk_source_buffer_input_stream_read (GInputStream *input_stream, memcpy ((gchar *)buffer + read, newline, newline_size); read += newline_size; - stream->priv->newline_added = TRUE; + stream->newline_added = TRUE; } } @@ -310,17 +313,17 @@ _gtk_source_buffer_input_stream_read (GInputStream *input_stream, static gboolean _gtk_source_buffer_input_stream_close (GInputStream *input_stream, - GCancellable *cancellable, - GError **error) + GCancellable *cancellable, + GError **error) { GtkSourceBufferInputStream *stream = GTK_SOURCE_BUFFER_INPUT_STREAM (input_stream); - stream->priv->newline_added = FALSE; + stream->newline_added = FALSE; - if (stream->priv->is_initialized && - stream->priv->buffer != NULL) + if (stream->is_initialized && + stream->buffer != NULL) { - gtk_text_buffer_delete_mark (stream->priv->buffer, stream->priv->pos); + gtk_text_buffer_delete_mark (stream->buffer, stream->pos); } return TRUE; @@ -328,25 +331,25 @@ _gtk_source_buffer_input_stream_close (GInputStream *input_stream, static void _gtk_source_buffer_input_stream_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkSourceBufferInputStream *stream = GTK_SOURCE_BUFFER_INPUT_STREAM (object); switch (prop_id) { case PROP_BUFFER: - g_assert (stream->priv->buffer == NULL); - stream->priv->buffer = g_value_dup_object (value); + g_assert (stream->buffer == NULL); + stream->buffer = g_value_dup_object (value); break; case PROP_NEWLINE_TYPE: - stream->priv->newline_type = g_value_get_enum (value); + stream->newline_type = g_value_get_enum (value); break; case PROP_ADD_TRAILING_NEWLINE: - stream->priv->add_trailing_newline = g_value_get_boolean (value); + stream->add_trailing_newline = g_value_get_boolean (value); break; default: @@ -357,24 +360,24 @@ _gtk_source_buffer_input_stream_set_property (GObject *object, static void _gtk_source_buffer_input_stream_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkSourceBufferInputStream *stream = GTK_SOURCE_BUFFER_INPUT_STREAM (object); switch (prop_id) { case PROP_BUFFER: - g_value_set_object (value, stream->priv->buffer); + g_value_set_object (value, stream->buffer); break; case PROP_NEWLINE_TYPE: - g_value_set_enum (value, stream->priv->newline_type); + g_value_set_enum (value, stream->newline_type); break; case PROP_ADD_TRAILING_NEWLINE: - g_value_set_boolean (value, stream->priv->add_trailing_newline); + g_value_set_boolean (value, stream->add_trailing_newline); break; default: @@ -388,7 +391,7 @@ _gtk_source_buffer_input_stream_dispose (GObject *object) { GtkSourceBufferInputStream *stream = GTK_SOURCE_BUFFER_INPUT_STREAM (object); - g_clear_object (&stream->priv->buffer); + g_clear_object (&stream->buffer); G_OBJECT_CLASS (_gtk_source_buffer_input_stream_parent_class)->dispose (object); } @@ -453,7 +456,7 @@ _gtk_source_buffer_input_stream_class_init (GtkSourceBufferInputStreamClass *kla static void _gtk_source_buffer_input_stream_init (GtkSourceBufferInputStream *stream) { - stream->priv = _gtk_source_buffer_input_stream_get_instance_private (stream); + stream = _gtk_source_buffer_input_stream_get_instance_private (stream); } /** @@ -466,8 +469,8 @@ _gtk_source_buffer_input_stream_init (GtkSourceBufferInputStream *stream) */ GtkSourceBufferInputStream * _gtk_source_buffer_input_stream_new (GtkTextBuffer *buffer, - GtkSourceNewlineType type, - gboolean add_trailing_newline) + GtkSourceNewlineType type, + gboolean add_trailing_newline) { g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL); @@ -483,12 +486,12 @@ _gtk_source_buffer_input_stream_get_total_size (GtkSourceBufferInputStream *stre { g_return_val_if_fail (GTK_SOURCE_IS_BUFFER_INPUT_STREAM (stream), 0); - if (stream->priv->buffer == NULL) + if (stream->buffer == NULL) { return 0; } - return gtk_text_buffer_get_char_count (stream->priv->buffer); + return gtk_text_buffer_get_char_count (stream->buffer); } gsize @@ -499,8 +502,8 @@ _gtk_source_buffer_input_stream_tell (GtkSourceBufferInputStream *stream) /* FIXME: is this potentially inefficient? If yes, we could keep track of the offset internally, assuming the mark doesn't move during the operation */ - if (!stream->priv->is_initialized || - stream->priv->buffer == NULL) + if (!stream->is_initialized || + stream->buffer == NULL) { return 0; } @@ -508,9 +511,9 @@ _gtk_source_buffer_input_stream_tell (GtkSourceBufferInputStream *stream) { GtkTextIter iter; - gtk_text_buffer_get_iter_at_mark (stream->priv->buffer, + gtk_text_buffer_get_iter_at_mark (stream->buffer, &iter, - stream->priv->pos); + stream->pos); return gtk_text_iter_get_offset (&iter); } } diff --git a/gtksourceview/gtksourcebufferinputstream.h b/gtksourceview/gtksourcebufferinputstream.h deleted file mode 100644 index 12deeadb..00000000 --- a/gtksourceview/gtksourcebufferinputstream.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- */ -/* - * This file is part of GtkSourceView - * - * Copyright 2010 - Ignacio Casal Quinteiro - * Copyright 2014 - Sébastien Wilmet - * - * GtkSourceView is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * GtkSourceView is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, see . - */ - -#pragma once - -#include -#include -#include "gtksourcetypes-private.h" -#include "gtksourcebuffer.h" -#include "gtksourcefile.h" - -G_BEGIN_DECLS - -#define GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM (_gtk_source_buffer_input_stream_get_type ()) -#define GTK_SOURCE_BUFFER_INPUT_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM, GtkSourceBufferInputStream)) -#define GTK_SOURCE_BUFFER_INPUT_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM, GtkSourceBufferInputStreamClass)) -#define GTK_SOURCE_IS_BUFFER_INPUT_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM)) -#define GTK_SOURCE_IS_BUFFER_INPUT_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM)) -#define GTK_SOURCE_BUFFER_INPUT_STREAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_BUFFER_INPUT_STREAM, GtkSourceBufferInputStreamClass)) - -typedef struct _GtkSourceBufferInputStreamClass GtkSourceBufferInputStreamClass; -typedef struct _GtkSourceBufferInputStreamPrivate GtkSourceBufferInputStreamPrivate; - -struct _GtkSourceBufferInputStream -{ - GInputStream parent; - - GtkSourceBufferInputStreamPrivate *priv; -}; - -struct _GtkSourceBufferInputStreamClass -{ - GInputStreamClass parent_class; -}; - -GTK_SOURCE_INTERNAL -GType _gtk_source_buffer_input_stream_get_type (void) G_GNUC_CONST; - -GTK_SOURCE_INTERNAL -GtkSourceBufferInputStream - *_gtk_source_buffer_input_stream_new (GtkTextBuffer *buffer, - GtkSourceNewlineType type, - gboolean add_trailing_newline); - -GTK_SOURCE_INTERNAL -gsize _gtk_source_buffer_input_stream_get_total_size (GtkSourceBufferInputStream *stream); - -GTK_SOURCE_INTERNAL -gsize _gtk_source_buffer_input_stream_tell (GtkSourceBufferInputStream *stream); - -G_END_DECLS diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c index a4f2e87d..dda555f9 100644 --- a/gtksourceview/gtksourcefilesaver.c +++ b/gtksourceview/gtksourcefilesaver.c @@ -26,7 +26,7 @@ #include "gtksourcefilesaver.h" #include #include "gtksourcefile.h" -#include "gtksourcebufferinputstream.h" +#include "gtksourcebufferinputstream-private.h" #include "gtksourceencoding.h" #include "gtksourcebuffer.h" #include "gtksourcebuffer-private.h" diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h index 2b947c69..dbafbd83 100644 --- a/gtksourceview/gtksourcetypes-private.h +++ b/gtksourceview/gtksourcetypes-private.h @@ -38,9 +38,9 @@ typedef struct _GtkSourceUndoManagerDefault GtkSourceUndoManagerDefault; #ifdef _MSC_VER /* For Visual Studio, we need to export the symbols used by the unit tests */ -#define GTK_SOURCE_INTERNAL __declspec(dllexport) +# define GTK_SOURCE_INTERNAL __declspec(dllexport) #else -#define GTK_SOURCE_INTERNAL G_GNUC_INTERNAL +# define GTK_SOURCE_INTERNAL G_GNUC_INTERNAL #endif G_END_DECLS diff --git a/testsuite/test-buffer-input-stream.c b/testsuite/test-buffer-input-stream.c index 1ae3cfed..bc8bcc01 100644 --- a/testsuite/test-buffer-input-stream.c +++ b/testsuite/test-buffer-input-stream.c @@ -23,7 +23,8 @@ #include #include #include -#include "gtksourceview/gtksourcebufferinputstream.h" + +#include "gtksourceview/gtksourcebufferinputstream-private.h" static void test_consecutive_read (const gchar *inbuf, -- GitLab From 80d771f170ff93eabe091248796377bf531748ac Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 11:34:59 -0800 Subject: [PATCH 037/248] completion: move internal API to -private.h headers --- docs/reference/meson.build | 4 +- gtksourceview/gtksourcecompletion-private.h | 9 +++- gtksourceview/gtksourcecompletion.c | 9 ++-- gtksourceview/gtksourcecompletion.h | 54 +++++++------------ .../gtksourcecompletioncontainer-private.h | 37 +++++++++++++ gtksourceview/gtksourcecompletioncontainer.c | 21 ++++---- gtksourceview/gtksourcecompletioncontainer.h | 54 ------------------- .../gtksourcecompletioncontext-private.h | 33 ++++++++++++ gtksourceview/gtksourcecompletioncontext.c | 3 +- gtksourceview/gtksourcecompletioncontext.h | 19 +++---- .../gtksourcecompletioninfo-private.h | 32 +++++++++++ gtksourceview/gtksourcecompletioninfo.c | 3 +- gtksourceview/gtksourcecompletioninfo.h | 3 -- gtksourceview/gtksourceview.c | 2 +- 14 files changed, 160 insertions(+), 123 deletions(-) create mode 100644 gtksourceview/gtksourcecompletioncontainer-private.h delete mode 100644 gtksourceview/gtksourcecompletioncontainer.h create mode 100644 gtksourceview/gtksourcecompletioncontext-private.h create mode 100644 gtksourceview/gtksourcecompletioninfo-private.h diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 372262b4..2324b862 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -11,8 +11,10 @@ reference_private_h = [ 'gtksourcebufferinputstream-private.h', 'gtksourcebufferinternal.h', 'gtksourcebufferoutputstream.h', - 'gtksourcecompletioncontainer.h', + 'gtksourcecompletioncontainer-private.h', + 'gtksourcecompletioncontext-private.h', 'gtksourcecompletionmodel.h', + 'gtksourcecompletioninfo-private.h', 'gtksourcecompletion-private.h', 'gtksourcecompletionwordsbuffer.h', 'gtksourcecompletionwordslibrary.h', diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtksourcecompletion-private.h index 21a1cf26..2bca815b 100644 --- a/gtksourceview/gtksourcecompletion-private.h +++ b/gtksourceview/gtksourcecompletion-private.h @@ -24,4 +24,11 @@ #include G_GNUC_INTERNAL -GtkSourceCompletion *gtk_source_completion_new (GtkSourceView *source_view); +GtkSourceCompletion *_gtk_source_completion_new (GtkSourceView *source_view); +G_GNUC_INTERNAL +void _gtk_source_completion_add_proposals (GtkSourceCompletion *completion, + GtkSourceCompletionContext *context, + GtkSourceCompletionProvider *provider, + GList *proposals, + gboolean finished); + diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c index 96962b13..437b0a62 100644 --- a/gtksourceview/gtksourcecompletion.c +++ b/gtksourceview/gtksourcecompletion.c @@ -104,10 +104,11 @@ #include #include "gtksourcecompletionmodel.h" #include "gtksourcecompletioncontext.h" -#include "gtksourcecompletioninfo.h" +#include "gtksourcecompletioninfo-private.h" #include "gtksourcecompletionproposal.h" #include "gtksourcecompletionprovider.h" -#include "gtksourcecompletioncontainer.h" +#include "gtksourcecompletioncontainer-private.h" +#include "gtksourcecompletioncontext-private.h" #include "gtksourcebuffer.h" #include "gtksource-marshal.h" #include "gtksourceview.h" @@ -2859,7 +2860,7 @@ gtk_source_completion_error_quark (void) } /** - * gtk_source_completion_new: + * _gtk_source_completion_new: * @view: a #GtkSourceView. * * Creates a new #GtkSourceCompletion associated with @view. @@ -2867,7 +2868,7 @@ gtk_source_completion_error_quark (void) * Returns: a new #GtkSourceCompletion. */ GtkSourceCompletion * -gtk_source_completion_new (GtkSourceView *view) +_gtk_source_completion_new (GtkSourceView *view) { g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL); diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h index 13e1a6f3..bdf3eaca 100644 --- a/gtksourceview/gtksourcecompletion.h +++ b/gtksourceview/gtksourcecompletion.h @@ -64,51 +64,33 @@ typedef enum _GtkSourceCompletionError } GtkSourceCompletionError; GTK_SOURCE_AVAILABLE_IN_ALL -GQuark gtk_source_completion_error_quark (void); - +GQuark gtk_source_completion_error_quark (void); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_completion_add_provider (GtkSourceCompletion *completion, - GtkSourceCompletionProvider *provider, - GError **error); - +gboolean gtk_source_completion_add_provider (GtkSourceCompletion *completion, + GtkSourceCompletionProvider *provider, + GError **error); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_completion_remove_provider (GtkSourceCompletion *completion, - GtkSourceCompletionProvider *provider, - GError **error); - +gboolean gtk_source_completion_remove_provider (GtkSourceCompletion *completion, + GtkSourceCompletionProvider *provider, + GError **error); GTK_SOURCE_AVAILABLE_IN_ALL -GList *gtk_source_completion_get_providers (GtkSourceCompletion *completion); - +GList *gtk_source_completion_get_providers (GtkSourceCompletion *completion); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_completion_start (GtkSourceCompletion *completion, - GList *providers, - GtkSourceCompletionContext *context); - +gboolean gtk_source_completion_start (GtkSourceCompletion *completion, + GList *providers, + GtkSourceCompletionContext *context); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_completion_hide (GtkSourceCompletion *completion); - +void gtk_source_completion_hide (GtkSourceCompletion *completion); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceCompletionInfo * - gtk_source_completion_get_info_window (GtkSourceCompletion *completion); - +GtkSourceCompletionInfo *gtk_source_completion_get_info_window (GtkSourceCompletion *completion); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceView *gtk_source_completion_get_view (GtkSourceCompletion *completion); - +GtkSourceView *gtk_source_completion_get_view (GtkSourceCompletion *completion); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceCompletionContext * - gtk_source_completion_create_context (GtkSourceCompletion *completion, - GtkTextIter *position); - +GtkSourceCompletionContext *gtk_source_completion_create_context (GtkSourceCompletion *completion, + GtkTextIter *position); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_completion_block_interactive (GtkSourceCompletion *completion); - +void gtk_source_completion_block_interactive (GtkSourceCompletion *completion); GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_completion_unblock_interactive (GtkSourceCompletion *completion); +void gtk_source_completion_unblock_interactive (GtkSourceCompletion *completion); -G_GNUC_INTERNAL -void _gtk_source_completion_add_proposals (GtkSourceCompletion *completion, - GtkSourceCompletionContext *context, - GtkSourceCompletionProvider *provider, - GList *proposals, - gboolean finished); G_END_DECLS diff --git a/gtksourceview/gtksourcecompletioncontainer-private.h b/gtksourceview/gtksourcecompletioncontainer-private.h new file mode 100644 index 00000000..dbb5af44 --- /dev/null +++ b/gtksourceview/gtksourcecompletioncontainer-private.h @@ -0,0 +1,37 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- + * + * This file is part of GtkSourceView + * + * Copyright 2013 - Sébastien Wilmet + * + * GtkSourceView is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * GtkSourceView is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see . + */ + +#pragma once + +#include + +#include "gtksourcetypes-private.h" + +G_BEGIN_DECLS + +#define GTK_SOURCE_TYPE_COMPLETION_CONTAINER (_gtk_source_completion_container_get_type()) + +G_GNUC_INTERNAL +G_DECLARE_FINAL_TYPE (GtkSourceCompletionContainer, _gtk_source_completion_container, GTK_SOURCE, COMPLETION_CONTAINER, GtkScrolledWindow) + +G_GNUC_INTERNAL +GtkSourceCompletionContainer *_gtk_source_completion_container_new (void); + +G_END_DECLS diff --git a/gtksourceview/gtksourcecompletioncontainer.c b/gtksourceview/gtksourcecompletioncontainer.c index 8b76bffb..5741be2b 100644 --- a/gtksourceview/gtksourcecompletioncontainer.c +++ b/gtksourceview/gtksourcecompletioncontainer.c @@ -31,14 +31,17 @@ #include "config.h" -#include "gtksourcecompletioncontainer.h" +#include "gtksourcecompletioncontainer-private.h" #define UNREALIZED_WIDTH 350 #define MAX_HEIGHT 180 -G_DEFINE_TYPE (GtkSourceCompletionContainer, - _gtk_source_completion_container, - GTK_TYPE_SCROLLED_WINDOW); +struct _GtkSourceCompletionContainer +{ + GtkScrolledWindow parent_instnace; +}; + +G_DEFINE_TYPE (GtkSourceCompletionContainer, _gtk_source_completion_container, GTK_TYPE_SCROLLED_WINDOW); static gint get_max_width (GtkSourceCompletionContainer *container) @@ -74,8 +77,8 @@ get_max_width (GtkSourceCompletionContainer *container) static void _gtk_source_completion_container_get_preferred_width (GtkWidget *widget, - gint *min_width, - gint *nat_width) + gint *min_width, + gint *nat_width) { GtkSourceCompletionContainer *container = GTK_SOURCE_COMPLETION_CONTAINER (widget); GtkWidget *child; @@ -113,7 +116,7 @@ _gtk_source_completion_container_get_preferred_width (GtkWidget *widget, static gint get_row_height (GtkSourceCompletionContainer *container, - gint tree_view_height) + gint tree_view_height) { GtkWidget *tree_view; GtkTreeModel *model; @@ -155,8 +158,8 @@ get_row_height (GtkSourceCompletionContainer *container, /* Return a height at a row boundary of the GtkTreeView. */ static void _gtk_source_completion_container_get_preferred_height (GtkWidget *widget, - gint *min_height, - gint *nat_height) + gint *min_height, + gint *nat_height) { GtkSourceCompletionContainer *container = GTK_SOURCE_COMPLETION_CONTAINER (widget); GtkWidget *child; diff --git a/gtksourceview/gtksourcecompletioncontainer.h b/gtksourceview/gtksourcecompletioncontainer.h deleted file mode 100644 index 36436e94..00000000 --- a/gtksourceview/gtksourcecompletioncontainer.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- - * - * This file is part of GtkSourceView - * - * Copyright 2013 - Sébastien Wilmet - * - * GtkSourceView is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * GtkSourceView is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, see . - */ - -#pragma once - -#include -#include "gtksourcetypes-private.h" - -G_BEGIN_DECLS - -#define GTK_SOURCE_TYPE_COMPLETION_CONTAINER (_gtk_source_completion_container_get_type ()) -#define GTK_SOURCE_COMPLETION_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTAINER, GtkSourceCompletionContainer)) -#define GTK_SOURCE_COMPLETION_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTAINER, GtkSourceCompletionContainerClass) -#define GTK_SOURCE_IS_COMPLETION_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTAINER)) -#define GTK_SOURCE_IS_COMPLETION_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTAINER)) -#define GTK_SOURCE_COMPLETION_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTAINER, GtkSourceCompletionContainerClass)) - -typedef struct _GtkSourceCompletionContainerClass GtkSourceCompletionContainerClass; - -struct _GtkSourceCompletionContainer -{ - GtkScrolledWindow parent; -}; - -struct _GtkSourceCompletionContainerClass -{ - GtkScrolledWindowClass parent_class; -}; - -G_GNUC_INTERNAL -GType _gtk_source_completion_container_get_type (void) G_GNUC_CONST; - -G_GNUC_INTERNAL -GtkSourceCompletionContainer * - _gtk_source_completion_container_new (void); - -G_END_DECLS diff --git a/gtksourceview/gtksourcecompletioncontext-private.h b/gtksourceview/gtksourcecompletioncontext-private.h new file mode 100644 index 00000000..cee96257 --- /dev/null +++ b/gtksourceview/gtksourcecompletioncontext-private.h @@ -0,0 +1,33 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- + * + * This file is part of GtkSourceView + * + * Copyright 2009 - Jesse van den Kieboom + * + * GtkSourceView is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * GtkSourceView is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see . + */ + +#pragma once + +#include "gtksourcecompletioncontext.h" + +G_BEGIN_DECLS + +G_GNUC_INTERNAL +GtkSourceCompletionContext *_gtk_source_completion_context_new (GtkSourceCompletion *completion, + GtkTextIter *position); +G_GNUC_INTERNAL +void _gtk_source_completion_context_cancel (GtkSourceCompletionContext *context); + +G_END_DECLS diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c index 1a843727..9e3a722a 100644 --- a/gtksourceview/gtksourcecompletioncontext.c +++ b/gtksourceview/gtksourcecompletioncontext.c @@ -61,7 +61,8 @@ #include "config.h" -#include "gtksourcecompletioncontext.h" +#include "gtksourcecompletion-private.h" +#include "gtksourcecompletioncontext-private.h" #include "gtksource-enumtypes.h" #include "gtksourcecompletionprovider.h" #include "gtksourcecompletion.h" diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h index da04f8b1..7aa7e774 100644 --- a/gtksourceview/gtksourcecompletioncontext.h +++ b/gtksourceview/gtksourcecompletioncontext.h @@ -52,19 +52,14 @@ typedef enum _GtkSourceCompletionActivation } GtkSourceCompletionActivation; GTK_SOURCE_AVAILABLE_IN_ALL -void gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *context, - GtkSourceCompletionProvider *provider, - GList *proposals, - gboolean finished); +void gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *context, + GtkSourceCompletionProvider *provider, + GList *proposals, + gboolean finished); GTK_SOURCE_AVAILABLE_IN_ALL -gboolean gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, - GtkTextIter *iter); +gboolean gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, + GtkTextIter *iter); GTK_SOURCE_AVAILABLE_IN_ALL -GtkSourceCompletionActivation gtk_source_completion_context_get_activation (GtkSourceCompletionContext *context); -G_GNUC_INTERNAL -GtkSourceCompletionContext *_gtk_source_completion_context_new (GtkSourceCompletion *completion, - GtkTextIter *position); -G_GNUC_INTERNAL -void _gtk_source_completion_context_cancel (GtkSourceCompletionContext *context); +GtkSourceCompletionActivation gtk_source_completion_context_get_activation (GtkSourceCompletionContext *context); G_END_DECLS diff --git a/gtksourceview/gtksourcecompletioninfo-private.h b/gtksourceview/gtksourcecompletioninfo-private.h new file mode 100644 index 00000000..d5998818 --- /dev/null +++ b/gtksourceview/gtksourcecompletioninfo-private.h @@ -0,0 +1,32 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- + * + * This file is part of GtkSourceView + * + * Copyright 2007 - 2009 Jesús Barbero Rodríguez + * Copyright 2009 - Jesse van den Kieboom + * + * GtkSourceView is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * GtkSourceView is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see . + */ + +#pragma once + +#include "gtksourcecompletioninfo.h" + +G_BEGIN_DECLS + +G_GNUC_INTERNAL +void _gtk_source_completion_info_set_xoffset (GtkSourceCompletionInfo *info, + gint xoffset); + +G_END_DECLS diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c index 427008cc..6b177fa6 100644 --- a/gtksourceview/gtksourcecompletioninfo.c +++ b/gtksourceview/gtksourcecompletioninfo.c @@ -57,9 +57,10 @@ #include "config.h" -#include "gtksourcecompletioninfo.h" #include +#include "gtksourcecompletioninfo-private.h" + struct _GtkSourceCompletionInfo { GtkWindow parent_instance; diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h index 423dce7e..25be7392 100644 --- a/gtksourceview/gtksourcecompletioninfo.h +++ b/gtksourceview/gtksourcecompletioninfo.h @@ -41,8 +41,5 @@ GTK_SOURCE_AVAILABLE_IN_ALL void gtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *info, GtkTextView *view, GtkTextIter *iter); -G_GNUC_INTERNAL -void _gtk_source_completion_info_set_xoffset (GtkSourceCompletionInfo *info, - gint xoffset); G_END_DECLS diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c index baa8750c..aaede543 100644 --- a/gtksourceview/gtksourceview.c +++ b/gtksourceview/gtksourceview.c @@ -4951,7 +4951,7 @@ gtk_source_view_get_completion (GtkSourceView *view) if (priv->completion == NULL) { - priv->completion = gtk_source_completion_new (view); + priv->completion = _gtk_source_completion_new (view); } return priv->completion; -- GitLab From fa0d364d76e33a17f80c8104da9351d3ad7110c2 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Jan 2020 11:47:36 -0800 Subject: [PATCH 038/248] renderer: modernize GtkSourceGutterRendererMarks --- docs/reference/meson.build | 2 +- .../gtksourcegutterrenderermarks-private.h | 39 +++++++++++++ gtksourceview/gtksourcegutterrenderermarks.c | 25 +++++---- gtksourceview/gtksourcegutterrenderermarks.h | 56 ------------------- gtksourceview/gtksourceview.c | 2 +- 5 files changed, 56 insertions(+), 68 deletions(-) create mode 100644 gtksourceview/gtksourcegutterrenderermarks-private.h delete mode 100644 gtksourceview/gtksourcegutterrenderermarks.h diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 2324b862..8415e80c 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -25,7 +25,7 @@ reference_private_h = [ 'gtksourceengine.h', 'gtksourcegutter-private.h', 'gtksourcegutterrendererlines.h', - 'gtksourcegutterrenderermarks.h', + 'gtksourcegutterrenderermarks-private.h', 'gtksourcegutterrenderer-private.h', 'gtksourceiter.h', 'gtksourcelanguage-private.h', diff --git a/gtksourceview/gtksourcegutterrenderermarks-private.h b/gtksourceview/gtksourcegutterrenderermarks-private.h new file mode 100644 index 00000000..83976c31 --- /dev/null +++ b/gtksourceview/gtksourcegutterrenderermarks-private.h @@ -0,0 +1,39 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- + * + * This file is part of GtkSourceView + * + * Copyright 2010 - Jesse van den Kieboom + * + * GtkSourceView is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * GtkSourceView is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see . + */ + +#pragma once + +#include + +#include "gtksourcetypes.h" +#include "gtksourcetypes-private.h" +#include "gtksourcegutterrendererpixbuf.h" + +G_BEGIN_DECLS + +#define GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS (gtk_source_gutter_renderer_marks_get_type()) + +G_GNUC_INTERNAL +G_DECLARE_FINAL_TYPE (GtkSourceGutterRendererMarks, gtk_source_gutter_renderer_marks, GTK_SOURCE, GUTTER_RENDERER_MARKS, GtkSourceGutterRendererPixbuf) + +G_GNUC_INTERNAL +GtkSourceGutterRenderer *gtk_source_gutter_renderer_marks_new (void); + +G_END_DECLS diff --git a/gtksourceview/gtksourcegutterrenderermarks.c b/gtksourceview/gtksourcegutterrenderermarks.c index af7da0e3..70f9d508 100644 --- a/gtksourceview/gtksourcegutterrenderermarks.c +++ b/gtksourceview/gtksourcegutterrenderermarks.c @@ -20,24 +20,29 @@ #include "config.h" -#include "gtksourcegutterrenderermarks.h" +#include "gtksourcegutterrenderermarks-private.h" #include "gtksourceview.h" #include "gtksourcebuffer.h" #include "gtksourcemarkattributes.h" #include "gtksourcemark.h" -#define COMPOSITE_ALPHA 225 +#define COMPOSITE_ALPHA 225 + +struct _GtkSourceGutterRendererMarks +{ + GtkSourceGutterRendererPixbuf parent_instance; +}; G_DEFINE_TYPE (GtkSourceGutterRendererMarks, gtk_source_gutter_renderer_marks, GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF) static gint sort_marks_by_priority (gconstpointer m1, - gconstpointer m2, - gpointer data) + gconstpointer m2, + gpointer data) { - GtkSourceMark *mark1 = GTK_SOURCE_MARK (m1); - GtkSourceMark *mark2 = GTK_SOURCE_MARK (m2); - GtkSourceView *view = GTK_SOURCE_VIEW (data); + GtkSourceMark *mark1 = (GtkSourceMark *)m1; + GtkSourceMark *mark2 = (GtkSourceMark *)m2; + GtkSourceView *view = data; GtkTextIter iter1, iter2; gint line1; gint line2; @@ -165,9 +170,9 @@ composite_marks (GtkSourceView *view, static void gutter_renderer_query_data (GtkSourceGutterRenderer *renderer, - GtkTextIter *start, - GtkTextIter *end, - GtkSourceGutterRendererState state) + GtkTextIter *start, + GtkTextIter *end, + GtkSourceGutterRendererState state) { GSList *marks; GdkPixbuf *pixbuf = NULL; diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h deleted file mode 100644 index 480d5ffc..00000000 --- a/gtksourceview/gtksourcegutterrenderermarks.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*- - * - * This file is part of GtkSourceView - * - * Copyright 2010 - Jesse van den Kieboom - * - * GtkSourceView is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * GtkSourceView is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, see . - */ - -#pragma once - -#include -#include "gtksourcetypes.h" -#include "gtksourcetypes-private.h" -#include "gtksourcegutterrendererpixbuf.h" - -G_BEGIN_DECLS - -#define GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS (gtk_source_gutter_renderer_marks_get_type ()) -#define GTK_SOURCE_GUTTER_RENDERER_MARKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarks)) -#define GTK_SOURCE_GUTTER_RENDERER_MARKS_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarks const)) -#define GTK_SOURCE_GUTTER_RENDERER_MARKS_CLASS(klass) (G_TYPE_CHECK_C