1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
commit d6868691ca02eeb4f2d71e63110e4f005f43bb56
Author: SammysHP <sven@sammyshp.de>
Date: Tue May 2 13:07:11 2017 +0200
Read skins from system-wide directory
This allows to set a system-wide skin directory during compile time:
$ make SKIN_SYS_DIR="/usr/share/free42/skins"
diff --git a/gtk/Makefile b/gtk/Makefile
index 01c0daf..892468d 100644
--- a/gtk/Makefile
+++ b/gtk/Makefile
@@ -84,6 +84,10 @@ SRCS += audio_alsa.cc
OBJS += audio_alsa.o
endif
+ifdef SKIN_SYS_DIR
+CXXFLAGS += -DSKIN_SYS_DIR=\"$(SKIN_SYS_DIR)\"
+endif
+
$(EXE): $(OBJS)
$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
diff --git a/gtk/shell_skin.cc b/gtk/shell_skin.cc
index e6b3e19..a7bf09f 100644
--- a/gtk/shell_skin.cc
+++ b/gtk/shell_skin.cc
@@ -83,7 +83,8 @@ static const SkinColor *skin_cmap;
static GdkPixbuf *disp_image = NULL;
-static char skin_label_buf[1024];
+#define SKIN_LABEL_BUF_SIZE 1024
+static char skin_label_buf[SKIN_LABEL_BUF_SIZE];
static int skin_label_pos;
static keymap_entry *keymap = NULL;
@@ -115,6 +116,12 @@ static int skin_open(const char *name, int open_layout);
static int skin_gets(char *buf, int buflen);
static void skin_close();
+#define SKIN_NAMES_LIST_SIZE 100
+static int read_skins_from_dir(const char *dirname, char *skinnames[]);
+static void add_skin_menu_items(const char * const skinnames[], int nskins,
+ GtkWidget *w, GtkMenu *skin_menu,
+ const char * const skinfilter[], int nskinfilter);
+
static void addMenuItem(GtkMenu *menu, const char *name) {
bool checked = false;
@@ -129,6 +136,8 @@ static void addMenuItem(GtkMenu *menu, const char *name) {
// Apparently, there is no way to retrieve the label from a menu item,
// so I have to store them and pass them to the callback explicitly.
+ if (skin_label_pos + strlen(name) >= SKIN_LABEL_BUF_SIZE)
+ return; // not enough space in buffer TODO
char *lbl = skin_label_buf + skin_label_pos;
strcpy(lbl, name);
skin_label_pos += strlen(name) + 1;
@@ -175,6 +184,16 @@ static int skin_open(const char *name, int open_layout) {
snprintf(namebuf, 1024, "%s/%s.%s", free42dirname, name,
open_layout ? "layout" : "gif");
external_file = fopen(namebuf, "r");
+
+#ifdef SKIN_SYS_DIR
+ // if skin was not found built-in or in home directory, try system-wide
+ if (external_file == NULL) {
+ snprintf(namebuf, 1024, "%s/%s.%s", SKIN_SYS_DIR, name,
+ open_layout ? "layout" : "gif");
+ external_file = fopen(namebuf, "r");
+ }
+#endif
+
return external_file != NULL;
}
@@ -220,31 +239,14 @@ static int case_insens_comparator(const void *a, const void *b) {
return strcasecmp(*(const char **) a, *(const char **) b);
}
-void skin_menu_update(GtkWidget *w) {
- int i, j;
-
- GtkMenu *skin_menu = (GtkMenu *) gtk_menu_item_get_submenu(GTK_MENU_ITEM(w));
- GList *children = gtk_container_get_children(GTK_CONTAINER(skin_menu));
- GList *item = children;
- while (item != NULL) {
- gtk_widget_destroy(GTK_WIDGET(item->data));
- item = item->next;
- }
- g_list_free(children);
-
- skin_label_pos = 0;
-
- for (i = 0; i < skin_count; i++)
- addMenuItem(skin_menu, skin_name[i]);
-
- DIR *dir = opendir(free42dirname);
+static int read_skins_from_dir(const char *dirname, char *skinnames[]) {
+ DIR *dir = opendir(dirname);
if (dir == NULL)
- return;
+ return 0;
struct dirent *dent;
- char *skinname[100];
int nskins = 0;
- while ((dent = readdir(dir)) != NULL && nskins < 100) {
+ while ((dent = readdir(dir)) != NULL && nskins < SKIN_NAMES_LIST_SIZE) {
int namelen = strlen(dent->d_name);
char *skn;
if (namelen < 7)
@@ -255,28 +257,89 @@ void skin_menu_update(GtkWidget *w) {
// TODO - handle memory allocation failure
memcpy(skn, dent->d_name, namelen - 7);
skn[namelen - 7] = 0;
- skinname[nskins++] = skn;
+ skinnames[nskins++] = skn;
}
closedir(dir);
- qsort(skinname, nskins, sizeof(char *), case_insens_comparator);
+ qsort(skinnames, nskins, sizeof(char *), case_insens_comparator);
+
+ return nskins;
+}
+
+static void add_skin_menu_items(const char * const skinnames[], int nskins,
+ GtkWidget *w, GtkMenu *skin_menu,
+ const char * const skinfilter[], int nskinfilter) {
+ int i, j;
bool have_separator = false;
+
for (i = 0; i < nskins; i++) {
+ // filter out built-in skins
for (j = 0; j < skin_count; j++)
- if (strcmp(skinname[i], skin_name[j]) == 0)
+ if (strcmp(skinnames[i], skin_name[j]) == 0)
+ goto skip;
+
+ // filter out skins from filter list (e.g. skins in home directory)
+ for (j = 0; j < nskinfilter; j++)
+ if (strcmp(skinnames[i], skinfilter[j]) == 0)
goto skip;
+
+ // add separator if first skin in this set
if (!have_separator) {
GtkWidget *w = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(skin_menu), w);
gtk_widget_show(w);
have_separator = true;
}
- addMenuItem(skin_menu, skinname[i]);
- skip:
- free(skinname[i]);
+
+ addMenuItem(skin_menu, skinnames[i]);
+skip:;
}
}
+void skin_menu_update(GtkWidget *w) {
+ int i;
+
+ // clear menu
+ GtkMenu *skin_menu = (GtkMenu *) gtk_menu_item_get_submenu(GTK_MENU_ITEM(w));
+ GList *children = gtk_container_get_children(GTK_CONTAINER(skin_menu));
+ GList *item = children;
+ while (item != NULL) {
+ gtk_widget_destroy(GTK_WIDGET(item->data));
+ item = item->next;
+ }
+ g_list_free(children);
+
+ skin_label_pos = 0;
+
+ // add built-in skins
+ for (i = 0; i < skin_count; i++)
+ addMenuItem(skin_menu, skin_name[i]);
+
+ // read skins from home directory
+ char *skins_home[SKIN_NAMES_LIST_SIZE];
+ int n_skins_home = read_skins_from_dir(free42dirname, skins_home);
+
+#ifdef SKIN_SYS_DIR
+ // read skins from system directory
+ char *skins_sys[SKIN_NAMES_LIST_SIZE];
+ int n_skins_sys = read_skins_from_dir(SKIN_SYS_DIR, skins_sys);
+
+ // add system-wide skins
+ add_skin_menu_items(skins_sys, n_skins_sys, w, skin_menu, skins_home, n_skins_home);
+#endif
+
+ // add home directory skins
+ add_skin_menu_items(skins_home, n_skins_home, w, skin_menu, NULL, 0);
+
+ // free memory
+ for (i = 0; i < n_skins_home; i++)
+ free(skins_home[i]);
+#ifdef SKIN_SYS_DIR
+ for (i = 0; i < n_skins_sys; i++)
+ free(skins_sys[i]);
+#endif
+}
+
void skin_load(int *width, int *height) {
char line[1024];
int success;
|