nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pack type rule_t into struct rule

Browse Source
This commit is contained in:
Benedikt Heine 2018-09-16 02:58:28 +02:00
parent de0f0bf3d9
commit 1fa1532d7f
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.h
View File

@ -110,7 +110,7 @@ struct settings defaults = {
}; };
rule_t default_rules[] = { struct rule default_rules[] = {
/* name can be any unique string. It is used to identify /* name can be any unique string. It is used to identify
* the rule in dunstrc to override it there * the rule in dunstrc to override it there
*/ */

8
src/rules.c
View File

@ -10,7 +10,7 @@
/* /*
* Apply rule to notification. * Apply rule to notification.
*/ */
void rule_apply(rule_t *r, notification *n) void rule_apply(struct rule *r, notification *n)
{ {
if (r->timeout != -1) if (r->timeout != -1)
n->timeout = r->timeout; n->timeout = r->timeout;
@ -53,7 +53,7 @@ void rule_apply(rule_t *r, notification *n)
void rule_apply_all(notification *n) void rule_apply_all(notification *n)
{ {
for (GSList *iter = rules; iter; iter = iter->next) { for (GSList *iter = rules; iter; iter = iter->next) {
rule_t *r = iter->data; struct rule *r = iter->data;
if (rule_matches_notification(r, n)) { if (rule_matches_notification(r, n)) {
rule_apply(r, n); rule_apply(r, n);
} }
@ -63,7 +63,7 @@ void rule_apply_all(notification *n)
/* /*
* Initialize rule with default values. * Initialize rule with default values.
*/ */
void rule_init(rule_t *r) void rule_init(struct rule *r)
{ {
r->name = NULL; r->name = NULL;
r->appname = NULL; r->appname = NULL;
@ -89,7 +89,7 @@ void rule_init(rule_t *r)
/* /*
* Check whether rule should be applied to n. * Check whether rule should be applied to n.
*/ */
bool rule_matches_notification(rule_t *r, notification *n) bool rule_matches_notification(struct rule *r, notification *n)
{ {
return ( (!r->appname || (n->appname && !fnmatch(r->appname, n->appname, 0))) return ( (!r->appname || (n->appname && !fnmatch(r->appname, n->appname, 0)))
&& (!r->summary || (n->summary && !fnmatch(r->summary, n->summary, 0))) && (!r->summary || (n->summary && !fnmatch(r->summary, n->summary, 0)))

10
src/rules.h
View File

@ -8,7 +8,7 @@
#include "notification.h" #include "notification.h"
#include "settings.h" #include "settings.h"
typedef struct _rule_t { struct rule {
char *name; char *name;
/* filters */ /* filters */
char *appname; char *appname;
@ -32,14 +32,14 @@ typedef struct _rule_t {
const char *format; const char *format;
const char *script; const char *script;
enum behavior_fullscreen fullscreen; enum behavior_fullscreen fullscreen;
} rule_t; };
extern GSList *rules; extern GSList *rules;
void rule_init(rule_t *r); void rule_init(struct rule *r);
void rule_apply(rule_t *r, notification *n); void rule_apply(struct rule *r, notification *n);
void rule_apply_all(notification *n); void rule_apply_all(notification *n);
bool rule_matches_notification(rule_t *r, notification *n); bool rule_matches_notification(struct rule *r, notification *n);
#endif #endif
/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */ /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */

6
src/settings.c
View File

@ -727,16 +727,16 @@ void load_settings(char *cmdline_config_path)
continue; continue;
/* check for existing rule with same name */ /* check for existing rule with same name */
rule_t *r = NULL; struct rule *r = NULL;
for (GSList *iter = rules; iter; iter = iter->next) { for (GSList *iter = rules; iter; iter = iter->next) {
rule_t *match = iter->data; struct rule *match = iter->data;
if (match->name && if (match->name &&
strcmp(match->name, cur_section) == 0) strcmp(match->name, cur_section) == 0)
r = match; r = match;
} }
if (!r) { if (!r) {
r = g_malloc(sizeof(rule_t)); r = g_malloc(sizeof(struct rule));
rule_init(r); rule_init(r);
rules = g_slist_insert(rules, r, -1); rules = g_slist_insert(rules, r, -1);
} }