clean up the data section for some organisation.. in preparation for e to have

proper abstractions to finding the right data files depending on user config
etc.

SVN revision: 3987

diff --git a/Makefile.am b/Makefile.am
index 6826ca2..44cdcf7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,7 @@ install-data-local:
        if test -d $(srcdir)/data; then \
          $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
          for d in $(srcdir)/data/*; do \
-           if test -f $$d; then \
-             $(INSTALL_DATA) $$d $(DESTDIR)$(pkgdatadir)/data; \
-           fi \
+             cp -ar $$d $(DESTDIR)$(pkgdatadir)/data; \
          done \
        fi
 
@@ -22,9 +20,7 @@ dist-hook:
        if test -d data; then \
          mkdir $(distdir)/data; \
          for d in data/*; do \
-           if test -f $$d; then \
-             cp -p $$d $(distdir)/d; \
-           fi \
+             cp -ar $$d $(distdir)/data; \
          done \
        fi
 

diff --git a/data/config/appearance/default/borders/border.bits.db b/data/config/appearance/default/borders/border.bits.db
new file mode 100644 (file)
index 0000000..159753e
Binary files /dev/null and b/data/config/appearance/default/borders/border.bits.db 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 (file)
index 0000000..7c9d03f
Binary files /dev/null and b/data/config/appearance/default/borders/border2.bits.db 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 (file)
index 0000000..610fd9a
Binary files /dev/null and b/data/config/appearance/default/borders/borderless.bits.db differ

diff --git a/data/config/behavior/default/actions.db b/data/config/behavior/default/actions.db
new file mode 100644 (file)
index 0000000..2dff2fd
Binary files /dev/null and b/data/config/behavior/default/actions.db differ

diff --git a/data/config/behavior/default/grabs.db b/data/config/behavior/default/grabs.db
new file mode 100644 (file)
index 0000000..a3c6bd8
Binary files /dev/null and b/data/config/behavior/default/grabs.db differ

diff --git a/data/config/behavior/default/settings.db b/data/config/behavior/default/settings.db
new file mode 100644 (file)
index 0000000..133ae49
Binary files /dev/null and b/data/config/behavior/default/settings.db differ

diff --git a/data/fonts/nationff.ttf b/data/fonts/nationff.ttf
new file mode 100644 (file)
index 0000000..e088334
Binary files /dev/null and b/data/fonts/nationff.ttf differ

diff --git a/data/images/bg.png b/data/images/bg.png
new file mode 100644 (file)
index 0000000..2065e15
Binary files /dev/null and b/data/images/bg.png differ

diff --git a/data/images/e_logo.png b/data/images/e_logo.png
new file mode 100644 (file)
index 0000000..f305b45
Binary files /dev/null and b/data/images/e_logo.png differ

diff --git a/data/orig/b1.png b/data/orig/b1.png
new file mode 100644 (file)
index 0000000..7fc0fc6
Binary files /dev/null and b/data/orig/b1.png differ

diff --git a/data/orig/b2.png b/data/orig/b2.png
new file mode 100644 (file)
index 0000000..3a60e0d
Binary files /dev/null and b/data/orig/b2.png differ

diff --git a/data/orig/b3.png b/data/orig/b3.png
new file mode 100644 (file)
index 0000000..aa55081
Binary files /dev/null and b/data/orig/b3.png differ

diff --git a/data/orig/b4.png b/data/orig/b4.png
new file mode 100644 (file)
index 0000000..e7c4d72
Binary files /dev/null and b/data/orig/b4.png differ

diff --git a/data/orig/b5.png b/data/orig/b5.png
new file mode 100644 (file)
index 0000000..f77e224
Binary files /dev/null and b/data/orig/b5.png differ

diff --git a/data/orig/b_t1.png b/data/orig/b_t1.png
new file mode 100644 (file)
index 0000000..64802a9
Binary files /dev/null and b/data/orig/b_t1.png differ

diff --git a/data/orig/b_t2.png b/data/orig/b_t2.png
new file mode 100644 (file)
index 0000000..bdaf80b
Binary files /dev/null and b/data/orig/b_t2.png differ

diff --git a/data/orig/b_t3.png b/data/orig/b_t3.png
new file mode 100644 (file)
index 0000000..75e111f
Binary files /dev/null and b/data/orig/b_t3.png differ

diff --git a/data/orig/bt1.png b/data/orig/bt1.png
new file mode 100644 (file)
index 0000000..8d0435e
Binary files /dev/null and b/data/orig/bt1.png differ

diff --git a/data/orig/bt2.png b/data/orig/bt2.png
new file mode 100644 (file)
index 0000000..6c65bcd
Binary files /dev/null and b/data/orig/bt2.png differ

diff --git a/data/orig/bt3.png b/data/orig/bt3.png
new file mode 100644 (file)
index 0000000..53e08f0
Binary files /dev/null and b/data/orig/bt3.png differ

diff --git a/data/orig/bt4.png b/data/orig/bt4.png
new file mode 100644 (file)
index 0000000..476323c
Binary files /dev/null and b/data/orig/bt4.png differ

diff --git a/data/orig/bt5.png b/data/orig/bt5.png
new file mode 100644 (file)
index 0000000..c0868c7
Binary files /dev/null and b/data/orig/bt5.png differ

diff --git a/data/orig/bt6.png b/data/orig/bt6.png
new file mode 100644 (file)
index 0000000..19d077c
Binary files /dev/null and b/data/orig/bt6.png differ

diff --git a/data/orig/bt7.png b/data/orig/bt7.png
new file mode 100644 (file)
index 0000000..d9de03c
Binary files /dev/null and b/data/orig/bt7.png differ

diff --git a/data/orig/bt8.png b/data/orig/bt8.png
new file mode 100644 (file)
index 0000000..a865b2a
Binary files /dev/null and b/data/orig/bt8.png differ

diff --git a/data/orig/s.png b/data/orig/s.png
new file mode 100644 (file)
index 0000000..239cc44
Binary files /dev/null and b/data/orig/s.png differ

diff --git a/data/orig/t1.png b/data/orig/t1.png
new file mode 100644 (file)
index 0000000..2b405da
Binary files /dev/null and b/data/orig/t1.png differ

diff --git a/data/orig/t2.png b/data/orig/t2.png
new file mode 100644 (file)
index 0000000..dc42bee
Binary files /dev/null and b/data/orig/t2.png differ

diff --git a/data/orig/t3.png b/data/orig/t3.png
new file mode 100644 (file)
index 0000000..d1baa3f
Binary files /dev/null and b/data/orig/t3.png differ

diff --git a/data/scripts/build_db.sh b/data/scripts/build_db.sh
new file mode 100755 (executable)
index 0000000..8d9cce6
--- /dev/null
+++ b/data/scripts/build_db.sh
@@ -0,0 +1,177 @@
+# enumerated variables
+ACT_MOUSE_IN=0
+ACT_MOUSE_OUT=1
+ACT_MOUSE_CLICK=2
+ACT_MOUSE_DOUBLE=3
+ACT_MOUSE_TRIPLE=4
+ACT_MOUSE_UP=5
+ACT_MOUSE_CLICKED=6
+ACT_MOUSE_MOVE=7
+ACT_KEY_DOWN=8
+ACT_KEY_UP=9
+
+MOD_ANY=-1
+MOD_NONE=0
+MOD_SHIFT=1
+MOD_CTRL=2
+MOD_ALT=4
+MOD_WIN=8
+
+FOCUS_POINTER=0
+FOCUS_SLOPPY=1
+FOCUS_CLICK=2
+
+# actions defining how to react to things
+DB="./actions.db"
+NUM=0
+edb_ed $DB add "/actions/"$NUM"/name"      str "Title_Bar"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Raise"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK  
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Title_Bar"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Move"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK  
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Title_Bar"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Shade"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_DOUBLE
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Resize"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Resize"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Resize_Horizontal"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Resize_Horizontal"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Resize_Vertical"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Resize_Vertical"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Window_Grab"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Move"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_ALT
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Window_Grab"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Resize"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 2
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_ALT
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Resize"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Move"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 3
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Resize_Horizontal"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Move"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 3
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Resize_Vertical"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Move"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICK
+edb_ed $DB add "/actions/"$NUM"/button"    int 3
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Close"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Close"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICKED
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Close"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Kill"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICKED
+edb_ed $DB add "/actions/"$NUM"/button"    int 3
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Max_Size"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Max_Size"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICKED
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Iconify"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Window_Iconify"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICKED
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/"$NUM"/name"      str "Menu"
+edb_ed $DB add "/actions/"$NUM"/action"    str "Menu"
+edb_ed $DB add "/actions/"$NUM"/params"    str ""
+edb_ed $DB add "/actions/"$NUM"/event"     int $ACT_MOUSE_CLICKED
+edb_ed $DB add "/actions/"$NUM"/button"    int 1
+edb_ed $DB add "/actions/"$NUM"/key"       str ""
+edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_NONE
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/actions/count"       int $NUM
+
+# basic settings
+DB="./settings.db"
+edb_ed $DB add "/move/resist"      int 1
+edb_ed $DB add "/move/resist/desk" int 24
+edb_ed $DB add "/move/resist/win"  int 12
+edb_ed $DB add "/focus/mode   "    int $FOCUS_POINTER
+
+# what events on windows are "grabbed" by the window manager
+DB="./grabs.db"
+NUM=0
+edb_ed $DB add "/grabs/"$NUM"/button"       int 1
+edb_ed $DB add "/grabs/"$NUM"/modifiers"    int $MOD_ALT
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/grabs/"$NUM"/button"       int 2
+edb_ed $DB add "/grabs/"$NUM"/modifiers"    int $MOD_ALT
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/grabs/"$NUM"/button"       int 3
+edb_ed $DB add "/grabs/"$NUM"/modifiers"    int $MOD_ALT
+NUM=$[ $NUM + 1 ];
+edb_ed $DB add "/grabs/count"       int $NUM
+

diff --git a/src/actions.c b/src/actions.c
index 907da63..4383819 100644 (file)
--- 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
 static void
 _e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o)
 {
-   char *actions_db = PACKAGE_DATA_DIR"/data/actions.db";
+   char *actions_db = PACKAGE_DATA_DIR"/data/config/behavior/default/actions.db";
    E_DB_File *db;
    int i, num;
    char *a_name = NULL;

diff --git a/src/border.c b/src/border.c
index 76bf741..a98b12b 100644 (file)
--- a/src/border.c
+++ b/src/border.c
@@ -377,7 +377,7 @@ e_focus_out(Eevent * ev)
        b = e_border_find_by_window(e->win);
        if (b)
          {     
-            char *settings_db = PACKAGE_DATA_DIR"/data/settings.db";
+            char *settings_db = PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db";
             E_DB_File *db;
             int focus_mode;
             char buf[4096];
@@ -988,9 +988,9 @@ e_border_apply_border(E_Border *b)
    int pl, pr, pt, pb;
    
    if ((!b->client.titlebar) && 
-       (!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/borderless.bits.db");
-   else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/border.bits.db");
-   else                     e_border_set_bits(b, PACKAGE_DATA_DIR"/data/border2.bits.db");
+       (!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/borderless.bits.db");
+   else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/border.bits.db");
+   else                     e_border_set_bits(b, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/border2.bits.db");
 
    pl = pr = pt = pb = 0;
    if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb);   
@@ -1066,7 +1066,7 @@ e_border_new(void)
    int max_colors = 216;
    int font_cache = 1024 * 1024;
    int image_cache = 8192 * 1024;
-   char *font_dir = PACKAGE_DATA_DIR"/data/fnt";
+   char *font_dir = PACKAGE_DATA_DIR"/data/fonts";
    E_Desktop *desk;
    
    b = NEW(E_Border, 1);
@@ -1223,8 +1223,8 @@ e_border_remove_mouse_grabs(E_Border *b)
 void
 e_border_attach_mouse_grabs(E_Border *b)
 {
-   char *grabs_db = PACKAGE_DATA_DIR"/data/grabs.db";
-   char *settings_db = PACKAGE_DATA_DIR"/data/settings.db";
+   char *grabs_db = PACKAGE_DATA_DIR"/data/config/behavior/default/grabs.db";
+   char *settings_db = PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db";
    E_DB_File *db;
    int focus_mode;
    char buf[4096];
@@ -1316,8 +1316,8 @@ e_border_attach_all_mouse_grabs(void)
 void
 e_border_redo_grabs(void)
 {   
-   char *grabs_db = PACKAGE_DATA_DIR"/data/grabs.db";
-   char *settings_db = PACKAGE_DATA_DIR"/data/settings.db";
+   char *grabs_db = PACKAGE_DATA_DIR"/data/config/behavior/default/grabs.db";
+   char *settings_db = PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db";
    static time_t mod_date_grabs = 0;
    static time_t mod_date_settings = 0;
    time_t mod;

diff --git a/src/desktops.c b/src/desktops.c
index 8c2f0a6..7418929 100644 (file)
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -372,7 +372,7 @@ e_desktops_init_file_display(E_Desktop *desk)
    int max_colors = 216;
    int font_cache = 1024 * 1024;
    int image_cache = 8192 * 1024;
-   char *font_dir = "./fnt";
+   char *font_dir = PACKAGE_DATA_DIR"/data/fonts";   
    
    /* software */
    desk->evas.desk = evas_new_all(e_display_get(),
@@ -398,11 +398,11 @@ e_desktops_init_file_display(E_Desktop *desk)
        Evas e;
        
        e = desk->evas.desk;
-       o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/bg.png");
+       o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/images/bg.png");
        evas_move(e, o, 0, 0);
        evas_resize(e, o, screen_w, screen_h);
        evas_show(e, o);
-       o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/e_logo.png");
+       o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/images/e_logo.png");
        evas_move(e, o, 0, 0);
        evas_show(e, o);
      }