projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use statically-allocated thread private data
[projects/chimara/chimara.git]
/
libchimara
/
style.c
diff --git
a/libchimara/style.c
b/libchimara/style.c
index 406a8848969f6d4cce70a9533694bac5401b374e..67240764ebf33e2b3c9922f6cf16a94cbb657d35 100644
(file)
--- a/
libchimara/style.c
+++ b/
libchimara/style.c
@@
-8,7
+8,7
@@
#include "stream.h"
#include "strio.h"
#include "stream.h"
#include "strio.h"
-extern GPrivate
*
glk_data_key;
+extern GPrivate glk_data_key;
static gboolean style_accept(GScanner *scanner, GTokenType token);
static gboolean style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk);
static gboolean style_accept(GScanner *scanner, GTokenType token);
static gboolean style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk);
@@
-34,7
+34,7
@@
static void style_cascade_colors(GtkTextTag *tag, GtkTextTag *glk_tag, GtkTextTa
void
glk_set_style(glui32 styl)
{
void
glk_set_style(glui32 styl)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
g_return_if_fail(glk_data->current_stream != NULL);
glk_set_style_stream(glk_data->current_stream, styl);
}
g_return_if_fail(glk_data->current_stream != NULL);
glk_set_style_stream(glk_data->current_stream, styl);
}
@@
-128,7
+128,7
@@
style_init_textbuffer(GtkTextBuffer *buffer)
{
g_return_if_fail(buffer != NULL);
{
g_return_if_fail(buffer != NULL);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
/* Place the default text tags in the textbuffer's tag table */
g_hash_table_foreach(glk_data->styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
/* Place the default text tags in the textbuffer's tag table */
g_hash_table_foreach(glk_data->styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@
-146,8
+146,8
@@
void
style_init_textgrid(GtkTextBuffer *buffer)
{
g_return_if_fail(buffer != NULL);
style_init_textgrid(GtkTextBuffer *buffer)
{
g_return_if_fail(buffer != NULL);
-
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
/* Place the default text tags in the textbuffer's tag table */
g_hash_table_foreach(glk_data->styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
/* Place the default text tags in the textbuffer's tag table */
g_hash_table_foreach(glk_data->styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@
-641,7
+641,7
@@
apply_stylehint_to_tag(GtkTextTag *tag, glui32 wintype, glui32 styl, glui32 hint
{
g_return_if_fail(tag != NULL);
{
g_return_if_fail(tag != NULL);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
GObject *tag_object = G_OBJECT(tag);
gint reverse_color = GPOINTER_TO_INT( g_object_get_data(tag_object, "reverse-color") );
GObject *tag_object = G_OBJECT(tag);
gint reverse_color = GPOINTER_TO_INT( g_object_get_data(tag_object, "reverse-color") );
@@
-801,7
+801,7
@@
query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint)
g_return_val_if_fail(tag != NULL, 0);
g_return_val_if_fail(tag != NULL, 0);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
switch(hint) {
case stylehint_Indentation:
switch(hint) {
case stylehint_Indentation:
@@
-896,7
+896,7
@@
glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val)
g_printf("glk_stylehint_set(wintype=%d, styl=%d, hint=%d, val=%d)\n", wintype, styl, hint, val);
#endif
g_printf("glk_stylehint_set(wintype=%d, styl=%d, hint=%d, val=%d)\n", wintype, styl, hint, val);
#endif
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
GtkTextTag *to_change;
if(wintype == wintype_TextBuffer || wintype == wintype_AllTypes) {
GtkTextTag *to_change;
if(wintype == wintype_TextBuffer || wintype == wintype_AllTypes) {
@@
-931,7
+931,7
@@
glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
g_printf("glk_stylehint_clear(wintype=%d, styl=%d, hint=%d)\n", wintype, styl, hint);
#endif
g_printf("glk_stylehint_clear(wintype=%d, styl=%d, hint=%d)\n", wintype, styl, hint);
#endif
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
GtkTextTag *tag;
switch(wintype) {
GtkTextTag *tag;
switch(wintype) {
@@
-1057,7
+1057,7
@@
glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result)
g_printf("glk_style_measure(win->rock=%d, styl=%d, hint=%d, result=...)\n", win->rock, styl, hint);
#endif
g_printf("glk_style_measure(win->rock=%d, styl=%d, hint=%d, result=...)\n", win->rock, styl, hint);
#endif
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
GtkTextTag *tag;
switch(win->type) {
GtkTextTag *tag;
switch(win->type) {
@@
-1083,7
+1083,7
@@
glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result)
PangoFontDescription *
get_current_font(guint32 wintype)
{
PangoFontDescription *
get_current_font(guint32 wintype)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(
&
glk_data_key);
GHashTable *styles, *glk_styles;
PangoFontDescription *font;
GHashTable *styles, *glk_styles;
PangoFontDescription *font;