SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtext: store palette as GdkColors

This commit is contained in:
TingPing 2013-10-10 21:02:24 -04:00
parent 04f34feb26
commit cbf275777c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fe-gtk/xtext.c
View File

@ -349,19 +349,13 @@ backend_draw_text (GtkXText *xtext, int dofill, GdkGC *gc, int x, int y,
static void static void
xtext_set_fg (GtkXText *xtext, GdkGC *gc, int index) xtext_set_fg (GtkXText *xtext, GdkGC *gc, int index)
{ {
GdkColor col; gdk_gc_set_foreground (gc, &xtext->palette[index]);
col.pixel = xtext->palette[index];
gdk_gc_set_foreground (gc, &col);
} }
static void static void
xtext_set_bg (GtkXText *xtext, GdkGC *gc, int index) xtext_set_bg (GtkXText *xtext, GdkGC *gc, int index)
{ {
GdkColor col; gdk_gc_set_background (gc, &xtext->palette[index]);
col.pixel = xtext->palette[index];
gdk_gc_set_background (gc, &col);
} }
static void static void
@ -685,8 +679,7 @@ gtk_xtext_realize (GtkWidget * widget)
gdk_gc_set_foreground (xtext->thin_gc, &col); gdk_gc_set_foreground (xtext->thin_gc, &col);
/* for the marker bar (marker) */ /* for the marker bar (marker) */
col.pixel = xtext->palette[XTEXT_MARKER]; gdk_gc_set_foreground (xtext->marker_gc, &xtext->palette[XTEXT_MARKER]);
gdk_gc_set_foreground (xtext->marker_gc, &col);
xtext_set_fg (xtext, xtext->fgc, XTEXT_FG); xtext_set_fg (xtext, xtext->fgc, XTEXT_FG);
xtext_set_bg (xtext, xtext->fgc, XTEXT_BG); xtext_set_bg (xtext, xtext->fgc, XTEXT_BG);
@ -3241,7 +3234,7 @@ gtk_xtext_set_palette (GtkXText * xtext, GdkColor palette[])
for (i = (XTEXT_COLS-1); i >= 0; i--) for (i = (XTEXT_COLS-1); i >= 0; i--)
{ {
xtext->palette[i] = palette[i].pixel; xtext->palette[i] = palette[i];
} }
if (GTK_WIDGET_REALIZED (xtext)) if (GTK_WIDGET_REALIZED (xtext))
@ -3250,8 +3243,7 @@ gtk_xtext_set_palette (GtkXText * xtext, GdkColor palette[])
xtext_set_bg (xtext, xtext->fgc, XTEXT_BG); xtext_set_bg (xtext, xtext->fgc, XTEXT_BG);
xtext_set_fg (xtext, xtext->bgc, XTEXT_BG); xtext_set_fg (xtext, xtext->bgc, XTEXT_BG);
col.pixel = xtext->palette[XTEXT_MARKER]; gdk_gc_set_foreground (xtext->marker_gc, &xtext->palette[XTEXT_MARKER]);
gdk_gc_set_foreground (xtext->marker_gc, &col);
} }
xtext->col_fore = XTEXT_FG; xtext->col_fore = XTEXT_FG;
xtext->col_back = XTEXT_BG; xtext->col_back = XTEXT_BG;

2
src/fe-gtk/xtext.h
View File

@ -141,7 +141,7 @@ struct _GtkXText
GdkGC *dark_gc; GdkGC *dark_gc;
GdkGC *thin_gc; GdkGC *thin_gc;
GdkGC *marker_gc; GdkGC *marker_gc;
gulong palette[XTEXT_COLS]; GdkColor palette[XTEXT_COLS];
gint io_tag; /* for delayed refresh events */ gint io_tag; /* for delayed refresh events */
gint add_io_tag; /* "" when adding new text */ gint add_io_tag; /* "" when adding new text */