Move the color-filter related stuff out of "color.h" into
"color_filters.h", as that's the appropriate place for it - "color.h" should just deal with "color_t". svn path=/trunk/; revision=11503
This commit is contained in:
parent
13e4c5b1f2
commit
c3cba6617b
28
color.h
28
color.h
|
@ -25,8 +25,6 @@
|
|||
#ifndef __COLOR_H__
|
||||
#define __COLOR_H__
|
||||
|
||||
#include "epan/dfilter/dfilter.h"
|
||||
|
||||
/*
|
||||
* Data structure holding RGB value for a color.
|
||||
*
|
||||
|
@ -55,30 +53,4 @@ typedef struct {
|
|||
*/
|
||||
gboolean initialize_color(color_t *color, guint16 red, guint16 green, guint16 blue);
|
||||
|
||||
/* Data for a color filter. */
|
||||
typedef struct _color_filter {
|
||||
gchar *filter_name; /* name of the filter */
|
||||
gchar *filter_text; /* text of the filter expression */
|
||||
color_t bg_color; /* background color for packets that match */
|
||||
color_t fg_color; /* foreground color for packets that match */
|
||||
dfilter_t *c_colorfilter; /* compiled filter expression */
|
||||
void *edit_dialog; /* if filter is being edited, dialog
|
||||
* box for it */
|
||||
gboolean marked; /* set if the filter is marked in the color dialog box */
|
||||
} color_filter_t;
|
||||
|
||||
/* List of all color filters. */
|
||||
extern GSList *filter_list;
|
||||
extern GSList *removed_filter_list;
|
||||
|
||||
/** Add a color filter.
|
||||
*
|
||||
* @param colorf the new color filter
|
||||
* @param arg the color filter widget
|
||||
*/
|
||||
void color_add_filter_cb (color_filter_t *colorf, gpointer arg);
|
||||
|
||||
void
|
||||
filter_list_prime_edt(epan_dissect_t *edt);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -27,6 +27,23 @@
|
|||
/** @file
|
||||
* Color filters.
|
||||
*/
|
||||
#include "epan/dfilter/dfilter.h"
|
||||
|
||||
/* Data for a color filter. */
|
||||
typedef struct _color_filter {
|
||||
gchar *filter_name; /* name of the filter */
|
||||
gchar *filter_text; /* text of the filter expression */
|
||||
color_t bg_color; /* background color for packets that match */
|
||||
color_t fg_color; /* foreground color for packets that match */
|
||||
dfilter_t *c_colorfilter; /* compiled filter expression */
|
||||
void *edit_dialog; /* if filter is being edited, dialog
|
||||
* box for it */
|
||||
gboolean marked; /* set if the filter is marked in the color dialog box */
|
||||
} color_filter_t;
|
||||
|
||||
/* List of all color filters. */
|
||||
extern GSList *filter_list;
|
||||
extern GSList *removed_filter_list;
|
||||
|
||||
/** Init the color filters. */
|
||||
void colfilter_init(void);
|
||||
|
@ -76,4 +93,13 @@ gboolean read_other_filters(gchar *path, gpointer arg);
|
|||
*/
|
||||
gboolean write_other_filters(gchar *path, gboolean only_marked);
|
||||
|
||||
/** Add a color filter.
|
||||
*
|
||||
* @param colorf the new color filter
|
||||
* @param arg the color filter widget
|
||||
*/
|
||||
void color_add_filter_cb (color_filter_t *colorf, gpointer arg);
|
||||
|
||||
void filter_list_prime_edt(epan_dissect_t *edt);
|
||||
|
||||
#endif
|
||||
|
|
1
file.c
1
file.c
|
@ -67,6 +67,7 @@
|
|||
#include <epan/filesystem.h>
|
||||
|
||||
#include "color.h"
|
||||
#include "color_filters.h"
|
||||
#include "column.h"
|
||||
#include <epan/packet.h>
|
||||
#include "range.h"
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
#include "font_utils.h"
|
||||
#include "simple_dialog.h"
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include "packet_list.h"
|
||||
#include "proto_draw.h"
|
||||
#include "follow_dlg.h"
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include "gtkglobals.h"
|
||||
#include "epan/epan.h"
|
||||
#include "color.h"
|
||||
#include "color_filters.h"
|
||||
#include "../ui_util.h"
|
||||
#include "ui_util.h"
|
||||
#include "main.h"
|
||||
|
|
Loading…
Reference in New Issue