summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--data/config/appearance/default/borders/border.bits.dbbin0 -> 425984 bytes
-rw-r--r--data/config/appearance/default/borders/border2.bits.dbbin0 -> 315392 bytes
-rw-r--r--data/config/appearance/default/borders/borderless.bits.dbbin0 -> 12288 bytes
-rw-r--r--data/config/behavior/default/actions.dbbin0 -> 36864 bytes
-rw-r--r--data/config/behavior/default/grabs.dbbin0 -> 12288 bytes
-rw-r--r--data/config/behavior/default/settings.dbbin0 -> 12288 bytes
-rw-r--r--data/fonts/nationff.ttfbin0 -> 59140 bytes
-rw-r--r--data/images/bg.pngbin0 -> 262896 bytes
-rw-r--r--data/images/e_logo.pngbin0 -> 16187 bytes
-rw-r--r--data/orig/b1.pngbin0 -> 1372 bytes
-rw-r--r--data/orig/b2.pngbin0 -> 123 bytes
-rw-r--r--data/orig/b3.pngbin0 -> 758 bytes
-rw-r--r--data/orig/b4.pngbin0 -> 118 bytes
-rw-r--r--data/orig/b5.pngbin0 -> 1133 bytes
-rw-r--r--data/orig/b_t1.pngbin0 -> 1731 bytes
-rw-r--r--data/orig/b_t2.pngbin0 -> 6387 bytes
-rw-r--r--data/orig/b_t3.pngbin0 -> 2656 bytes
-rw-r--r--data/orig/bt1.pngbin0 -> 540 bytes
-rw-r--r--data/orig/bt2.pngbin0 -> 548 bytes
-rw-r--r--data/orig/bt3.pngbin0 -> 517 bytes
-rw-r--r--data/orig/bt4.pngbin0 -> 473 bytes
-rw-r--r--data/orig/bt5.pngbin0 -> 517 bytes
-rw-r--r--data/orig/bt6.pngbin0 -> 481 bytes
-rw-r--r--data/orig/bt7.pngbin0 -> 572 bytes
-rw-r--r--data/orig/bt8.pngbin0 -> 528 bytes
-rw-r--r--data/orig/s.pngbin0 -> 301 bytes
-rw-r--r--data/orig/t1.pngbin0 -> 1446 bytes
-rw-r--r--data/orig/t2.pngbin0 -> 947 bytes
-rw-r--r--data/orig/t3.pngbin0 -> 1245 bytes
-rwxr-xr-xdata/scripts/build_db.sh177
-rw-r--r--src/actions.c2
-rw-r--r--src/border.c18
-rw-r--r--src/desktops.c6
34 files changed, 192 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index 6826ca273..44cdcf700 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,7 @@ install-data-local:
12 if test -d $(srcdir)/data; then \ 12 if test -d $(srcdir)/data; then \
13 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ 13 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
14 for d in $(srcdir)/data/*; do \ 14 for d in $(srcdir)/data/*; do \
15 if test -f $$d; then \ 15 cp -ar $$d $(DESTDIR)$(pkgdatadir)/data; \
16 $(INSTALL_DATA) $$d $(DESTDIR)$(pkgdatadir)/data; \
17 fi \
18 done \ 16 done \
19 fi 17 fi
20 18
@@ -22,9 +20,7 @@ dist-hook:
22 if test -d data; then \ 20 if test -d data; then \
23 mkdir $(distdir)/data; \ 21 mkdir $(distdir)/data; \
24 for d in data/*; do \ 22 for d in data/*; do \
25 if test -f $$d; then \ 23 cp -ar $$d $(distdir)/data; \
26 cp -p $$d $(distdir)/d; \
27 fi \
28 done \ 24 done \
29 fi 25 fi
30 26
diff --git a/data/config/appearance/default/borders/border.bits.db b/data/config/appearance/default/borders/border.bits.db
new file mode 100644
index 000000000..159753eee
--- /dev/null
+++ b/data/config/appearance/default/borders/border.bits.db
Binary files differ
diff --git a/data/config/appearance/default/borders/border2.bits.db b/data/config/appearance/default/borders/border2.bits.db
new file mode 100644
index 000000000..7c9d03ffc
--- /dev/null
+++ b/data/config/appearance/default/borders/border2.bits.db
Binary files differ
diff --git a/data/config/appearance/default/borders/borderless.bits.db b/data/config/appearance/default/borders/borderless.bits.db
new file mode 100644
index 000000000..610fd9a17
--- /dev/null
+++ b/data/config/appearance/default/borders/borderless.bits.db
Binary files differ
diff --git a/data/config/behavior/default/actions.db b/data/config/behavior/default/actions.db
new file mode 100644
index 000000000..2dff2fd8b
--- /dev/null
+++ b/data/config/behavior/default/actions.db
Binary files differ
diff --git a/data/config/behavior/default/grabs.db b/data/config/behavior/default/grabs.db
new file mode 100644
index 000000000..a3c6bd868
--- /dev/null
+++ b/data/config/behavior/default/grabs.db
Binary files differ
diff --git a/data/config/behavior/default/settings.db b/data/config/behavior/default/settings.db
new file mode 100644
index 000000000..133ae4941
--- /dev/null
+++ b/data/config/behavior/default/settings.db
Binary files differ
diff --git a/data/fonts/nationff.ttf b/data/fonts/nationff.ttf
new file mode 100644
index 000000000..e0883345e
--- /dev/null
+++ b/data/fonts/nationff.ttf
Binary files differ
diff --git a/data/images/bg.png b/data/images/bg.png
new file mode 100644
index 000000000..2065e15e8
--- /dev/null
+++ b/data/images/bg.png
Binary files differ
diff --git a/data/images/e_logo.png b/data/images/e_logo.png
new file mode 100644
index 000000000..f305b4500
--- /dev/null
+++ b/data/images/e_logo.png
Binary files differ
diff --git a/data/orig/b1.png b/data/orig/b1.png
new file mode 100644
index 000000000..7fc0fc651
--- /dev/null
+++ b/data/orig/b1.png
Binary files differ
diff --git a/data/orig/b2.png b/data/orig/b2.png
new file mode 100644
index 000000000..3a60e0df5
--- /dev/null
+++ b/data/orig/b2.png
Binary files differ
diff --git a/data/orig/b3.png b/data/orig/b3.png
new file mode 100644
index 000000000..aa5508198
--- /dev/null
+++ b/data/orig/b3.png
Binary files differ
diff --git a/data/orig/b4.png b/data/orig/b4.png
new file mode 100644
index 000000000..e7c4d723c
--- /dev/null
+++ b/data/orig/b4.png
Binary files differ
diff --git a/data/orig/b5.png b/data/orig/b5.png
new file mode 100644
index 000000000..f77e22498
--- /dev/null
+++ b/data/orig/b5.png
Binary files differ
diff --git a/data/orig/b_t1.png b/data/orig/b_t1.png
new file mode 100644
index 000000000..64802a9c5
--- /dev/null
+++ b/data/orig/b_t1.png
Binary files differ
diff --git a/data/orig/b_t2.png b/data/orig/b_t2.png
new file mode 100644
index 000000000..bdaf80b19
--- /dev/null
+++ b/data/orig/b_t2.png
Binary files differ
diff --git a/data/orig/b_t3.png b/data/orig/b_t3.png
new file mode 100644
index 000000000..75e111f50
--- /dev/null
+++ b/data/orig/b_t3.png
Binary files differ
diff --git a/data/orig/bt1.png b/data/orig/bt1.png
new file mode 100644
index 000000000..8d0435e49
--- /dev/null
+++ b/data/orig/bt1.png
Binary files differ
diff --git a/data/orig/bt2.png b/data/orig/bt2.png
new file mode 100644
index 000000000..6c65bcd56
--- /dev/null
+++ b/data/orig/bt2.png
Binary files differ
diff --git a/data/orig/bt3.png b/data/orig/bt3.png
new file mode 100644
index 000000000..53e08f02d
--- /dev/null
+++ b/data/orig/bt3.png
Binary files differ
diff --git a/data/orig/bt4.png b/data/orig/bt4.png
new file mode 100644
index 000000000..476323c0e
--- /dev/null
+++ b/data/orig/bt4.png
Binary files differ
diff --git a/data/orig/bt5.png b/data/orig/bt5.png
new file mode 100644
index 000000000..c0868c7d4
--- /dev/null
+++ b/data/orig/bt5.png
Binary files differ
diff --git a/data/orig/bt6.png b/data/orig/bt6.png
new file mode 100644
index 000000000..19d077cbc
--- /dev/null
+++ b/data/orig/bt6.png
Binary files differ
diff --git a/data/orig/bt7.png b/data/orig/bt7.png
new file mode 100644
index 000000000..d9de03c37
--- /dev/null
+++ b/data/orig/bt7.png
Binary files differ
diff --git a/data/orig/bt8.png b/data/orig/bt8.png
new file mode 100644
index 000000000..a865b2a73
--- /dev/null
+++ b/data/orig/bt8.png
Binary files differ
diff --git a/data/orig/s.png b/data/orig/s.png
new file mode 100644
index 000000000..239cc4488
--- /dev/null
+++ b/data/orig/s.png
Binary files differ
diff --git a/data/orig/t1.png b/data/orig/t1.png
new file mode 100644
index 000000000..2b405da7e
--- /dev/null
+++ b/data/orig/t1.png
Binary files differ
diff --git a/data/orig/t2.png b/data/orig/t2.png
new file mode 100644
index 000000000..dc42beec3
--- /dev/null
+++ b/data/orig/t2.png
Binary files differ
diff --git a/data/orig/t3.png b/data/orig/t3.png
new file mode 100644
index 000000000..d1baa3f49
--- /dev/null
+++ b/data/orig/t3.png
Binary files differ
diff --git a/data/scripts/build_db.sh b/data/scripts/build_db.sh
new file mode 100755
index 000000000..8d9cce682
--- /dev/null
+++ b/data/scripts/build_db.sh
@@ -0,0 +1,177 @@
1# enumerated variables
2ACT_MOUSE_IN=0
3ACT_MOUSE_OUT=1
4ACT_MOUSE_CLICK=2
5ACT_MOUSE_DOUBLE=3
6ACT_MOUSE_TRIPLE=4
7ACT_MOUSE_UP=5
8ACT_MOUSE_CLICKED=6
9ACT_MOUSE_MOVE=7
10ACT_KEY_DOWN=8
11ACT_KEY_UP=9
12
13MOD_ANY=-1
14MOD_NONE=0
15MOD_SHIFT=1
16MOD_CTRL=2
17MOD_ALT=4
18MOD_WIN=8
19
20FOCUS_POINTER=0
21FOCUS_SLOPPY=1
22FOCUS_CLICK=2
23
24# actions defining how to react to things
25DB="./actions.db"
26NUM=0
27edb_ed $DB add "/actions/"$NUM"/name" str "Title_Bar"
28edb_ed $DB add "/actions/"$NUM"/action" str "Window_Raise"
29edb_ed $DB add "/actions/"$NUM"/params" str ""
30edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
31edb_ed $DB add "/actions/"$NUM"/button" int 1
32edb_ed $DB add "/actions/"$NUM"/key" str ""
33edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
34NUM=$[ $NUM + 1 ];
35edb_ed $DB add "/actions/"$NUM"/name" str "Title_Bar"
36edb_ed $DB add "/actions/"$NUM"/action" str "Window_Move"
37edb_ed $DB add "/actions/"$NUM"/params" str ""
38edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
39edb_ed $DB add "/actions/"$NUM"/button" int 1
40edb_ed $DB add "/actions/"$NUM"/key" str ""
41edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
42NUM=$[ $NUM + 1 ];
43edb_ed $DB add "/actions/"$NUM"/name" str "Title_Bar"
44edb_ed $DB add "/actions/"$NUM"/action" str "Window_Shade"
45edb_ed $DB add "/actions/"$NUM"/params" str ""
46edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_DOUBLE
47edb_ed $DB add "/actions/"$NUM"/button" int 1
48edb_ed $DB add "/actions/"$NUM"/key" str ""
49edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
50NUM=$[ $NUM + 1 ];
51edb_ed $DB add "/actions/"$NUM"/name" str "Resize"
52edb_ed $DB add "/actions/"$NUM"/action" str "Window_Resize"
53edb_ed $DB add "/actions/"$NUM"/params" str ""
54edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
55edb_ed $DB add "/actions/"$NUM"/button" int 1
56edb_ed $DB add "/actions/"$NUM"/key" str ""
57edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
58NUM=$[ $NUM + 1 ];
59edb_ed $DB add "/actions/"$NUM"/name" str "Resize_Horizontal"
60edb_ed $DB add "/actions/"$NUM"/action" str "Window_Resize_Horizontal"
61edb_ed $DB add "/actions/"$NUM"/params" str ""
62edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
63edb_ed $DB add "/actions/"$NUM"/button" int 1
64edb_ed $DB add "/actions/"$NUM"/key" str ""
65edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
66NUM=$[ $NUM + 1 ];
67edb_ed $DB add "/actions/"$NUM"/name" str "Resize_Vertical"
68edb_ed $DB add "/actions/"$NUM"/action" str "Window_Resize_Vertical"
69edb_ed $DB add "/actions/"$NUM"/params" str ""
70edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
71edb_ed $DB add "/actions/"$NUM"/button" int 1
72edb_ed $DB add "/actions/"$NUM"/key" str ""
73edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
74NUM=$[ $NUM + 1 ];
75edb_ed $DB add "/actions/"$NUM"/name" str "Window_Grab"
76edb_ed $DB add "/actions/"$NUM"/action" str "Window_Move"
77edb_ed $DB add "/actions/"$NUM"/params" str ""
78edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
79edb_ed $DB add "/actions/"$NUM"/button" int 1
80edb_ed $DB add "/actions/"$NUM"/key" str ""
81edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_ALT
82NUM=$[ $NUM + 1 ];
83edb_ed $DB add "/actions/"$NUM"/name" str "Window_Grab"
84edb_ed $DB add "/actions/"$NUM"/action" str "Window_Resize"
85edb_ed $DB add "/actions/"$NUM"/params" str ""
86edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
87edb_ed $DB add "/actions/"$NUM"/button" int 2
88edb_ed $DB add "/actions/"$NUM"/key" str ""
89edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_ALT
90NUM=$[ $NUM + 1 ];
91edb_ed $DB add "/actions/"$NUM"/name" str "Resize"
92edb_ed $DB add "/actions/"$NUM"/action" str "Window_Move"
93edb_ed $DB add "/actions/"$NUM"/params" str ""
94edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
95edb_ed $DB add "/actions/"$NUM"/button" int 3
96edb_ed $DB add "/actions/"$NUM"/key" str ""
97edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
98NUM=$[ $NUM + 1 ];
99edb_ed $DB add "/actions/"$NUM"/name" str "Resize_Horizontal"
100edb_ed $DB add "/actions/"$NUM"/action" str "Window_Move"
101edb_ed $DB add "/actions/"$NUM"/params" str ""
102edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
103edb_ed $DB add "/actions/"$NUM"/button" int 3
104edb_ed $DB add "/actions/"$NUM"/key" str ""
105edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
106NUM=$[ $NUM + 1 ];
107edb_ed $DB add "/actions/"$NUM"/name" str "Resize_Vertical"
108edb_ed $DB add "/actions/"$NUM"/action" str "Window_Move"
109edb_ed $DB add "/actions/"$NUM"/params" str ""
110edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICK
111edb_ed $DB add "/actions/"$NUM"/button" int 3
112edb_ed $DB add "/actions/"$NUM"/key" str ""
113edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
114NUM=$[ $NUM + 1 ];
115edb_ed $DB add "/actions/"$NUM"/name" str "Close"
116edb_ed $DB add "/actions/"$NUM"/action" str "Window_Close"
117edb_ed $DB add "/actions/"$NUM"/params" str ""
118edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICKED
119edb_ed $DB add "/actions/"$NUM"/button" int 1
120edb_ed $DB add "/actions/"$NUM"/key" str ""
121edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
122NUM=$[ $NUM + 1 ];
123edb_ed $DB add "/actions/"$NUM"/name" str "Close"
124edb_ed $DB add "/actions/"$NUM"/action" str "Window_Kill"
125edb_ed $DB add "/actions/"$NUM"/params" str ""
126edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICKED
127edb_ed $DB add "/actions/"$NUM"/button" int 3
128edb_ed $DB add "/actions/"$NUM"/key" str ""
129edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
130NUM=$[ $NUM + 1 ];
131edb_ed $DB add "/actions/"$NUM"/name" str "Max_Size"
132edb_ed $DB add "/actions/"$NUM"/action" str "Window_Max_Size"
133edb_ed $DB add "/actions/"$NUM"/params" str ""
134edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICKED
135edb_ed $DB add "/actions/"$NUM"/button" int 1
136edb_ed $DB add "/actions/"$NUM"/key" str ""
137edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
138NUM=$[ $NUM + 1 ];
139edb_ed $DB add "/actions/"$NUM"/name" str "Iconify"
140edb_ed $DB add "/actions/"$NUM"/action" str "Window_Iconify"
141edb_ed $DB add "/actions/"$NUM"/params" str ""
142edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICKED
143edb_ed $DB add "/actions/"$NUM"/button" int 1
144edb_ed $DB add "/actions/"$NUM"/key" str ""
145edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
146NUM=$[ $NUM + 1 ];
147edb_ed $DB add "/actions/"$NUM"/name" str "Menu"
148edb_ed $DB add "/actions/"$NUM"/action" str "Menu"
149edb_ed $DB add "/actions/"$NUM"/params" str ""
150edb_ed $DB add "/actions/"$NUM"/event" int $ACT_MOUSE_CLICKED
151edb_ed $DB add "/actions/"$NUM"/button" int 1
152edb_ed $DB add "/actions/"$NUM"/key" str ""
153edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
154NUM=$[ $NUM + 1 ];
155edb_ed $DB add "/actions/count" int $NUM
156
157# basic settings
158DB="./settings.db"
159edb_ed $DB add "/move/resist" int 1
160edb_ed $DB add "/move/resist/desk" int 24
161edb_ed $DB add "/move/resist/win" int 12
162edb_ed $DB add "/focus/mode " int $FOCUS_POINTER
163
164# what events on windows are "grabbed" by the window manager
165DB="./grabs.db"
166NUM=0
167edb_ed $DB add "/grabs/"$NUM"/button" int 1
168edb_ed $DB add "/grabs/"$NUM"/modifiers" int $MOD_ALT
169NUM=$[ $NUM + 1 ];
170edb_ed $DB add "/grabs/"$NUM"/button" int 2
171edb_ed $DB add "/grabs/"$NUM"/modifiers" int $MOD_ALT
172NUM=$[ $NUM + 1 ];
173edb_ed $DB add "/grabs/"$NUM"/button" int 3
174edb_ed $DB add "/grabs/"$NUM"/modifiers" int $MOD_ALT
175NUM=$[ $NUM + 1 ];
176edb_ed $DB add "/grabs/count" int $NUM
177
diff --git a/src/actions.c b/src/actions.c
index 907da636a..4383819b8 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -57,7 +57,7 @@ static void e_act_zoom_start (void *o, E_Action *a, void *data, int x, int y, in
57static void 57static void
58_e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o) 58_e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o)
59{ 59{
60 char *actions_db = PACKAGE_DATA_DIR"/data/actions.db"; 60 char *actions_db = PACKAGE_DATA_DIR"/data/config/behavior/default/actions.db";
61 E_DB_File *db; 61 E_DB_File *db;
62 int i, num; 62 int i, num;
63 char *a_name = NULL; 63 char *a_name = NULL;
diff --git a/src/border.c b/src/border.c
index 76bf7415d..a98b12bca 100644
--- a/src/border.c
+++ b/src/border.c
@@ -377,7 +377,7 @@ e_focus_out(Eevent * ev)
377 b = e_border_find_by_window(e->win); 377 b = e_border_find_by_window(e->win);
378 if (b) 378 if (b)
379 { 379 {
380 char *settings_db = PACKAGE_DATA_DIR"/data/settings.db"; 380 char *settings_db = PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db";
381 E_DB_File *db; 381 E_DB_File *db;
382 int focus_mode; 382 int focus_mode;
383 char buf[4096]; 383 char buf[4096];
@@ -988,9 +988,9 @@ e_border_apply_border(E_Border *b)
988 int pl, pr, pt, pb; 988 int pl, pr, pt, pb;
989 989
990 if ((!b->client.titlebar) && 990 if ((!b->client.titlebar) &&
991 (!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/borderless.bits.db"); 991 (!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/borderless.bits.db");
992 else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/border.bits.db"); 992 else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/border.bits.db");
993 else e_border_set_bits(b, PACKAGE_DATA_DIR"/data/border2.bits.db"); 993 else e_border_set_bits(b, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/border2.bits.db");
994 994
995 pl = pr = pt = pb = 0; 995 pl = pr = pt = pb = 0;
996 if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb); 996 if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb);
@@ -1066,7 +1066,7 @@ e_border_new(void)
1066 int max_colors = 216; 1066 int max_colors = 216;
1067 int font_cache = 1024 * 1024; 1067 int font_cache = 1024 * 1024;
1068 int image_cache = 8192 * 1024; 1068 int image_cache = 8192 * 1024;
1069 char *font_dir = PACKAGE_DATA_DIR"/data/fnt"; 1069 char *font_dir = PACKAGE_DATA_DIR"/data/fonts";
1070 E_Desktop *desk; 1070 E_Desktop *desk;
1071 1071
1072 b = NEW(E_Border, 1); 1072 b = NEW(E_Border, 1);
@@ -1223,8 +1223,8 @@ e_border_remove_mouse_grabs(E_Border *b)
1223void 1223void
1224e_border_attach_mouse_grabs(E_Border *b) 1224e_border_attach_mouse_grabs(E_Border *b)
1225{ 1225{
1226 char *grabs_db = PACKAGE_DATA_DIR"/data/grabs.db"; 1226 char *grabs_db = PACKAGE_DATA_DIR"/data/config/behavior/default/grabs.db";
1227 char *settings_db = PACKAGE_DATA_DIR"/data/settings.db"; 1227 char *settings_db = PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db";
1228 E_DB_File *db; 1228 E_DB_File *db;
1229 int focus_mode; 1229 int focus_mode;
1230 char buf[4096]; 1230 char buf[4096];
@@ -1316,8 +1316,8 @@ e_border_attach_all_mouse_grabs(void)
1316void 1316void
1317e_border_redo_grabs(void) 1317e_border_redo_grabs(void)
1318{ 1318{
1319 char *grabs_db = PACKAGE_DATA_DIR"/data/grabs.db"; 1319 char *grabs_db = PACKAGE_DATA_DIR"/data/config/behavior/default/grabs.db";
1320 char *settings_db = PACKAGE_DATA_DIR"/data/settings.db"; 1320 char *settings_db = PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db";
1321 static time_t mod_date_grabs = 0; 1321 static time_t mod_date_grabs = 0;
1322 static time_t mod_date_settings = 0; 1322 static time_t mod_date_settings = 0;
1323 time_t mod; 1323 time_t mod;
diff --git a/src/desktops.c b/src/desktops.c
index 8c2f0a61b..74189293c 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -372,7 +372,7 @@ e_desktops_init_file_display(E_Desktop *desk)
372 int max_colors = 216; 372 int max_colors = 216;
373 int font_cache = 1024 * 1024; 373 int font_cache = 1024 * 1024;
374 int image_cache = 8192 * 1024; 374 int image_cache = 8192 * 1024;
375 char *font_dir = "./fnt"; 375 char *font_dir = PACKAGE_DATA_DIR"/data/fonts";
376 376
377 /* software */ 377 /* software */
378 desk->evas.desk = evas_new_all(e_display_get(), 378 desk->evas.desk = evas_new_all(e_display_get(),
@@ -398,11 +398,11 @@ e_desktops_init_file_display(E_Desktop *desk)
398 Evas e; 398 Evas e;
399 399
400 e = desk->evas.desk; 400 e = desk->evas.desk;
401 o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/bg.png"); 401 o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/images/bg.png");
402 evas_move(e, o, 0, 0); 402 evas_move(e, o, 0, 0);
403 evas_resize(e, o, screen_w, screen_h); 403 evas_resize(e, o, screen_w, screen_h);
404 evas_show(e, o); 404 evas_show(e, o);
405 o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/e_logo.png"); 405 o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/images/e_logo.png");
406 evas_move(e, o, 0, 0); 406 evas_move(e, o, 0, 0);
407 evas_show(e, o); 407 evas_show(e, o);
408 } 408 }