eo: make eo ptr indirection caches flexible

this addition is motivated by the fact that the access() API on
Windows just check if a file is read only or read/write. See

https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/access-waccess?view=msvc-170#remarks

This API now also manage if a file/dir is executable or not.

On Unix, access() is just called.

README.md

@@ -32,8 +32,8 @@ For more documentation please see:
 
 EFL is primarily developed on Linux (GNU/Linux) and should work on
 most distributions as long as dependencies are provided. It has been
-compiled and run also on Windows (using MSYS2 + mingw-w64 - please see
-[Phabricator windows docs](https://phab.enlightenment.org/w/windows)),
+compiled and run also on Windows (using MSYS2 + mingw-w64) - please see
+[windows docs](https://www.enlightenment.org/docs/distros/windows-start.md),
 Mac OS X, FreeBSD and NetBSD.
 
 ## Components
@@ -347,7 +347,7 @@ Required by default:
 * openjpeg2
 * gstreamer (Ensure all codecs you want are installed.)
 * zlib
-* luajit (lua 5.1 or 5.2 support optional)
+* lua (lua 5.1, luajit or lua 5.2 support optional)
 * libtiff
 * openssl
 * curl

data/elementary/themes/colorclasses.edc

@@ -337,7 +337,7 @@ color_tree {
       "/fg/normal/text-preedit";
       "/fg/normal/text-info";
       "/fg/normal/text-type";
-      "/fg/nmormal/fileselector/pathsep";
+      "/fg/normal/fileselector/pathsep";
       "/fg/selected/button/bar";
       "/fg/normal/button-anchor";
       "/fg/selected/thumb/bar";
@@ -406,6 +406,7 @@ color_tree {
       "/fg/normal/fileman/filesize/2";
       "/fg/selected/fileman/filesize/2";
       "/fg/normal/fileperm/execute";
+      "/fg/normal/filegraph/bar";
    }
    ":selected-alt-trans" {
       "/bg/normal/access";
@@ -475,6 +476,7 @@ color_tree {
       "/fg/normal/fileman/mount/off";
       "/fg/normal/progress/busy/2";
       "/fg/normal/gadgets/packagekit/pkg/low-priority";
+      "/fg/normal/filegraph/bartop";
    }
    ":light-high" {
       "/fg/normal/naviframe/top/overlap";
@@ -1292,7 +1294,7 @@ color_classes {
 //   color_class { name: "/fg/disabled/flipselector/up";
 //      color:  96  96  96 255; }
 ///////////////////////////////////////////////////////////////////////////////
-//   color_class { name: "/fg/nmormal/fileselector/pathsep";
+//   color_class { name: "/fg/normal/fileselector/pathsep";
 //      color:  51 153 255 255; }
 ///////////////////////////////////////////////////////////////////////////////
 //   color_class { name: "/bg/normal/button";

data/elementary/themes/edc/border.edc

@@ -1,3 +1,13 @@
+// Define this to enable a demo title blur
+//#define BLUR_TITLE 1
+// Define this to enable a demo blue behind everythnig - conflicts with title
+//#define BLUR_BEHIND 1
+
+// Some values used if blur is enabled
+#define BLUR_FORCE_ALPHA      160
+#define BLUR_TITLE_AMOUNT     "32"
+#define BLUR_BEHIND_AMOUNT    "32"
+
 group { name: "e/widgets/border/volume";
    images.image: "shadow_circle_vert.png" COMP;
    parts {
@@ -164,6 +174,15 @@ group { name: "e/widgets/border/default/border";
          }
       }
       WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
+#ifdef BLUR_BEHIND
+      snapshot { name: "title-blur"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "top";
+            rel2.to: "bottom";
+            filter.code: "padding_set { 0 } blur { "BLUR_BEHIND_AMOUNT", color = '#ffff' }";
+         }
+      }
+#endif
       part { name: "client_clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to_y: "e.swallow.client";
@@ -193,12 +212,23 @@ group { name: "e/widgets/border/default/border";
             rel2.offset: -1 -1;
          }
       }
+#ifdef BLUR_TITLE
+      snapshot { name: "title-blur"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel.to: "top";
+            filter.code: "padding_set { 0 } blur { "BLUR_TITLE_AMOUNT", color = '#ffff' }";
+         }
+      }
+#endif
       part { name: "top"; type: RECT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             rel2.to_y: "e.text.title";
             rel2.offset: -1 2;
             color_class: "/bg/normal/titlebar";
+#if defined(BLUR_TITLE) || defined(BLUR_BEHIND)
+            color: 255 255 255 BLUR_FORCE_ALPHA;
+#endif
             offscale;
          }
          description { state: "focused" 0.0;
@@ -494,6 +524,9 @@ group { name: "e/widgets/border/default/border";
          description { state: "default" 0.0;
             color_class: "/bg/normal/border";
             rel.to: "bottom";
+#if defined(BLUR_BEHIND)
+            color: 255 255 255 BLUR_FORCE_ALPHA;
+#endif
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;

data/elementary/themes/edc/comp.edc

@@ -267,11 +267,70 @@ group { name: "e/comp/frame/default";
             color_class: "/bg/selected/comp/win";
          }
       }
+#define FOCUSGLOWSZ 20
+      part { name: "focusglow"; type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel.to: "e.swallow.content";
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            offscale;
+            rel1.offset: (0-FOCUSGLOWSZ) (0-FOCUSGLOWSZ);
+            rel2.offset: (FOCUSGLOWSZ-1) (FOCUSGLOWSZ-1);
+            color: 255 255 255 0; // no cc
+        }
+      }
+      part { name: "focusglow1"; type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            clip_to: "focusglow";
+            offscale;
+            rel2.relative: 1.0 0.0;
+            rel1.offset: (0-FOCUSGLOWSZ) (0-FOCUSGLOWSZ);
+            rel2.offset: (FOCUSGLOWSZ-1) -1;
+            color_class: "/bg/selected/comp/focusglow";
+         }
+      }
+      part { name: "focusglow2"; type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            clip_to: "focusglow";
+            offscale;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: (0-FOCUSGLOWSZ) 0;
+            rel2.offset: (FOCUSGLOWSZ-1) (FOCUSGLOWSZ-1);
+            color_class: "/bg/selected/comp/focusglow";
+         }
+      }
+      part { name: "focusglow3"; type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            clip_to: "focusglow";
+            offscale;
+            rel2.relative: 0.0 1.0;
+            rel1.offset: (0-FOCUSGLOWSZ) 0;
+            rel2.offset: -1 -1;
+            color_class: "/bg/selected/comp/focusglow";
+         }
+      }
+      part { name: "focusglow4"; type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            clip_to: "focusglow";
+            offscale;
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: (FOCUSGLOWSZ-1) -1;
+            color_class: "/bg/selected/comp/focusglow";
+         }
+      }
+#undef FOCUSGLOWSZ
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "focus-clipper";
          description { state: "default" 0.0;
             rel.to: "shower";
-         }
+          }
       }
       spacer { "gspacer";
          desc {
@@ -326,6 +385,21 @@ group { name: "e/comp/frame/default";
          transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
          targets: "focus-clipper" "focus-shadow";
       }
+      program { name: "focusbounce";
+         signal: "e,state,focused"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "focusglow";
+         sequence {
+            action: STATE_SET "active" 0.0;
+            target: "focusglow";
+            transition: DECELERATE 0.3 USE_DURATION_FACTOR 1;
+         }
+      }
+      program { name: "focusbounceoff";
+         signal: "e,state,unfocused"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "focusglow";
+      }
 /*
       program { name: "urgent1";
          signal: "e,state,urgent"; source: "e";
@@ -361,6 +435,15 @@ group { name: "e/comp/frame/rotate";
    alias: "e/comp/frame/rotate/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
+      part { name: "focusglow"; type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+        }
+      }
       part { name: "e.swallow.content";
          description { state: "default";
             map {
@@ -394,6 +477,12 @@ group { name: "e/comp/frame/rotate";
          target: "e.swallow.content";
          transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
       }
+      program { name: "focusbounce";
+         signal: "xxx";
+      }
+      program { name: "focusbounceoff";
+         signal: "xxx";
+      }
    }
 }
 
@@ -427,11 +516,28 @@ group { name: "e/comp/frame/popup";
    alias: "e/comp/frame/popup/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
+      part { name: "focusglow"; type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+        }
+      }
       part { name: "focus-clipper";
          description { state: "default";
          }
       }
    }
+   programs {
+      program { name: "focusbounce";
+         signal: "xxx";
+      }
+      program { name: "focusbounceoff";
+         signal: "xxx";
+      }
+   }
 }
 
 group { name: "e/comp/frame/none";
@@ -455,6 +561,15 @@ group { name: "e/comp/frame/still";
    alias: "e/comp/frame/still/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
+      part { name: "focusglow"; type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+        }
+      }
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
@@ -462,6 +577,14 @@ group { name: "e/comp/frame/still";
          }
       }
    }
+   programs {
+      program { name: "focusbounce";
+         signal: "xxx";
+      }
+      program { name: "focusbounceoff";
+         signal: "xxx";
+      }
+   }
 }
 
 group { name: "e/comp/frame/menu";
@@ -488,6 +611,15 @@ group { name: "e/comp/frame/everything";
    alias: "e/comp/frame/everything/fast"; // legacy
    inherit: "e/comp/frame/popup";
    parts {
+      part { name: "focusglow"; type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+        }
+      }
       part { name: "shadow";
          description { state: "hidden" 0.0;
             visible: 1;
@@ -500,6 +632,14 @@ group { name: "e/comp/frame/everything";
          }
       }
    }
+   programs {
+      program { name: "focusbounce";
+         signal: "xxx";
+      }
+      program { name: "focusbounceoff";
+         signal: "xxx";
+      }
+   }
 }
 
 group { name: "e/comp/frame/fullscreen";

data/elementary/themes/edc/desklock.edc

@@ -17,7 +17,7 @@ group { name: "e/desklock/background";
             color_class: "/bg/normal/desklock/background";
          }
       }
-      program { signal: "show"; source: "";
+      program { name: "shower"; signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
          transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
          target: "clip";
@@ -30,6 +30,14 @@ group { name: "e/desklock/background";
             action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
+      program { signal: "e,action,show,immediate"; source: "e";
+         action: ACTION_STOP;
+         target: "shower";
+         sequence {
+            action: STATE_SET "visible" 0.0;
+            target: "clip";
+         }
+      }
       part { name: "e.swallow.login_box"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;

data/elementary/themes/edc/efl/border.edc

@@ -263,7 +263,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.to_x: "event.minimize";
             rel2.to_y: "shadow_base";
             align: 0.5 0.0;
-            color_class: "/fg/noemal/titlebar";
+            color_class: "/fg/normal/titlebar";
             min: 0 16;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
@@ -330,7 +330,7 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color_class: "/fg/noemal/titlebar/close";
+            color_class: "/fg/normal/titlebar/close";
          }
          desc { "selected";
             inherit: "default";
@@ -345,7 +345,7 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color_class: "/fg/noemal/titlebar/maximize";
+            color_class: "/fg/normal/titlebar/maximize";
          }
          desc { "selected";
             inherit: "default";

data/elementary/themes/edc/elm/fileselector.edc

@@ -6,7 +6,7 @@ group { name: "elm/entry/path/separator/default";
             image.normal: "i-arrow-r";
             FIXED_SIZE(15, 15)
             aspect: 1.0 1.0;
-            color_class: "/fg/nmormal/fileselector/pathsep";
+            color_class: "/fg/normal/fileselector/pathsep";
          }
       }
    }

data/elementary/themes/edc/elm/radio.edc

@@ -908,3 +908,301 @@ group { name: "elm/radio/base/icon";
       }
    }
 }
+
+group { name: "elm/radio/base/sort_header";
+   script {
+      BUTTONMODE_SCRIPT
+      public sel;
+      public eval_sel(m) {
+         if (m) {
+            set_state(PART:"ck_check", "selected", 0.0);
+         } else {
+            set_state(PART:"ck_check", "default", 0.0);
+         }
+      }
+   }
+   parts {
+      part { name: "shadow"; type: SPACER;
+         description { state: "default";
+         }
+         desc { "pressed"; inherit;
+         }
+         desc { "disabled"; inherit;
+         }
+      }
+      swallow { "elm.swallow.background"; nomouse;
+         desc { "default";
+            visible: 0;
+         }
+         desc { "visible"; inherit;
+            visible: 1;
+         }
+      }
+      rect { "icon_clip";
+         desc { "default";
+            color: 255 255 255 255; // no cc
+         }
+         desc { "pressed"; inherit;
+            color: 255 255 255 255; // no cc
+         }
+         desc { "disabled"; inherit;
+            color: 255 255 255 64; // no cc
+         }
+      }
+      swallow { "elm.swallow.content"; nomouse;
+         clip_to: "icon_clip";
+         scale: 1;
+         desc { "default";
+            fixed: 1 0;
+            align: 0.0 0.5;
+            rel1.to_x: "base";
+            rel2.to_x: "base";
+            rel1.offset: 4 4;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 4 -5;
+            visible: 0;
+            offscale;
+         }
+         desc { "visible"; inherit;
+            fixed: 1 0;
+            aspect: 1.0 1.0;
+            min: ICMIN ICMIN;
+            visible: 1;
+         }
+         desc { "icononly"; inherit;
+            fixed: 0 0;
+            align: 0.5 0.5;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -5 -5;
+            rel2.to_x: "";
+            visible: 1;
+            min: ICMIN ICMIN;
+         }
+      }
+      part { name: "base"; type: RECT;
+         scale: 1;
+         description { state: "default";
+            fixed: 1 0;
+            align: 0.0 0.5;
+            min: 13 13;
+            max: 13 13;
+            rel1.offset: 4 4;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 4 -5;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            offscale;
+            visible: 0;
+            offscale;
+         }
+         desc { "pressed"; inherit;
+         }
+         desc { "disabled"; inherit;
+         }
+      }
+      part { name: "ck_bg";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel.to: "base";
+            image.normal: "i-arrow-d";
+            min: 15 15;
+            max: 15 15;
+            color_class: "/bg/normal/radio/base";
+         }
+         desc { "disabled"; inherit;
+            color_class: "/bg/disabled/radio/base";
+         }
+      }
+      part { name: "ck_check";
+         scale: 1;
+         description { state: "default" 0.0;
+            color_class: "/fg/selected/radio/radio";
+            rel.to: "base";
+            image.normal: "i-arrow-d";
+            min: 15 15;
+            max: 15 15;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         desc { "disabled"; inherit;
+            visible: 0;
+         }
+      }
+      part { name: "ck_press";
+         scale: 1;
+         description { state: "default" 0.0;
+            color_class: "/fg/pressed/radio/radio";
+            fixed: 1 1;
+            rel.to: "base";
+            image.normal: "i-arrow-d";
+            min: 15 15;
+            max: 15 15;
+            visible: 0;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      text { "elm.text"; nomouse;
+         scale: 1;
+         desc { "default";
+            fixed: 0 1;
+            color_class: "/fg/normal/radio/text";
+            rel1.offset: 0 4;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "elm.swallow.content";
+            rel2.offset: -5 -5;
+            text { font: FN; size: 10;
+               align: 0.0 0.5;
+               min: 0 0;
+               ellipsis: 0;
+            }
+            visible: 0;
+            offscale;
+            min: 0 ICMIN;
+         }
+         desc { "visible"; inherit;
+            fixed: 0 0;
+            rel1.offset: 4 4;
+//            text.min: 1 1;
+//            text.ellipsis: -1;
+            visible: 1;
+         }
+         desc { "pressed_visible"; inherit;
+            fixed: 0 0;
+            color_class: "/fg/pressed/radio/text";
+            rel1.offset: 4 4;
+//            text.min: 1 1;
+//            text.ellipsis: -1;
+            visible: 1;
+         }
+         desc { "textonly"; inherit;
+            fixed: 0 0;
+//            text.min: 1 1;
+//            text.ellipsis: -1;
+            visible: 1;
+         }
+         desc { "pressed_textonly"; inherit;
+            fixed: 0 0;
+            color_class: "/fg/pressed/radio/text";
+//            text.min: 1 1;
+//            text.ellipsis: -1;
+            visible: 1;
+         }
+         desc { "disabled_visible"; inherit;
+            fixed: 0 0;
+            color_class: "/fg/disabled/radio/text";
+            rel1.offset: 4 4;
+//            text.min: 1 1;
+//            text.ellipsis: -1;
+            visible: 1;
+         }
+         desc { "disabled_textonly"; inherit;
+            fixed: 0 0;
+            color_class: "/fg/disabled/radio/text";
+//            text.min: 1 1;
+//            text.ellipsis: -1;
+            visible: 1;
+         }
+      }
+      rect { "event";
+         ignore_flags: ON_HOLD;
+         desc { "default";
+            color: 0 0 0 0; // no cc
+         }
+         desc { "disabled"; inherit;
+            visible: 0;
+         }
+      }
+   }
+   programs {
+      program { signal: "mouse,clicked,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,radio,toggle" "elm";
+      }
+      program { signal: "elm,state,radio,on"; source: "elm";
+         script {
+            new m = get_int(sel) | SELECTED;
+            set_int(sel, m);
+            eval_sel(m);
+         }
+      }
+      program { signal: "elm,state,radio,off"; source: "elm";
+         script {
+            new m = get_int(sel) & ~SELECTED;
+            set_int(sel, m);
+            eval_sel(m);
+         }
+      }
+      program { signal: "mouse,down,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,press" "elm";
+         after: "button_click_anim";
+      }
+      program { name: "button_click_anim";
+         script { flag_set(PRESSED); }
+      }
+      program { signal: "mouse,down,1"; source: "event";
+         script { eval_sel(get_int(sel) | SELECTED); }
+      }
+      program { signal: "mouse,up,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,unpress" "elm";
+         after: "button_unclick_anim";
+      }
+      program { name: "button_unclick_anim";
+         script { flag_unset(PRESSED); }
+      }
+      program { signal: "mouse,up,1"; source: "event";
+         script { eval_sel(get_int(sel)); }
+      }
+      program { signal: "mouse,clicked,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,click" "elm";
+      }
+      program { signal: "elm,state,text,visible"; source: "elm";
+         script { flag_set(LABEL); }
+      }
+      program { signal: "elm,state,text,hidden"; source: "elm";
+         script { flag_unset(LABEL); }
+      }
+      program { signal: "elm,state,icon,visible"; source: "elm";
+         script { flag_set(ICON); }
+      }
+      program { signal: "elm,state,icon,hidden"; source: "elm";
+         script { flag_unset(ICON); }
+      }
+      program { signal: "elm,state,background,visible"; source: "elm";
+         script { flag_set(BACKGROUND); }
+      }
+      program { signal: "elm,state,background,hidden"; source: "elm";
+         script { flag_unset(BACKGROUND); }
+      }
+      program { signal: "elm,state,disabled"; source: "elm";
+         script { flag_set(DISABLE); }
+      }
+      program { signal: "elm,state,enabled"; source: "elm";
+         script { flag_unset(DISABLE); }
+      }
+      program { signal: "elm,state,disabled"; source: "elm";
+         action:  STATE_SET "disabled" 0.0;
+         target: "ck_check";
+         target: "ck_bg";
+      }
+      program { signal: "elm,state,enabled"; source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "ck_check";
+         target: "ck_bg";
+      }
+      program { signal: "mouse,down,1"; source: "event";
+         action: STATE_SET "pressed" 0.0;
+         target: "ck_press";
+      }
+      program { signal: "mouse,up,1"; source: "event";
+         action: STATE_SET "default" 0.0;
+         target: "ck_press";
+      }
+   }
+}

data/elementary/themes/edc/elm/scroller.edc

@@ -28,16 +28,12 @@ group { name: "elm/scroller/base/default";
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "elm.swallow.background";
+            rel.to: "elm.swallow.content";
          }
       }
       part { name: "elm.swallow.background"; type: SWALLOW;
-//         scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
-//            rel1.offset: 2 2;
-//            rel2.offset: -3 -3;
-//            offscale;
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
@@ -187,7 +183,7 @@ group { name: "elm/scroller/base/default";
 
       part { name: "sh_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "elm.swallow.background";
+            rel.to: "clipper";
          }
       }
       //////////////////////////////////////////////////////////////////////

data/elementary/themes/edc/elm/slider.edc

@@ -335,7 +335,7 @@ group { name: "elm/slider/horizontal/default";
             rel2.to_x: "elm.swallow.bar";
          }
       }
-      part { name: "knob"; repeat_events: 1;
+     part { name: "knob"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -354,7 +354,7 @@ group { name: "elm/slider/horizontal/default";
             color_class: "/fg/disabled/slider/knob";
          }
       }
-      part { name: "slideevent"; type: RECT; repeat_events: 1;
+      part { name: "slideevent"; type: RECT; repeat_events: 0;
          scale: 1;
          ignore_flags: ON_HOLD;
          dragable.events: "elm.dragable.slider";
@@ -947,7 +947,7 @@ group { name: "elm/slider/vertical/default";
             rel2.to_y: "elm.swallow.bar";
          }
       }
-      part { name: "knob"; repeat_events: 1;
+      part { name: "knob"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -966,7 +966,7 @@ group { name: "elm/slider/vertical/default";
             color_class: "/fg/disabled/slider/knob";
          }
       }
-      part { name: "slideevent"; type: RECT; repeat_events: 1;
+      part { name: "slideevent"; type: RECT; repeat_events: 0;
          scale: 1;
          ignore_flags: ON_HOLD;
          dragable.events: "elm.dragable.slider";
@@ -1614,7 +1614,7 @@ group { name: "elm/slider/range/horizontal/default";
             rel2.to_x: "elm.swallow.bar";
          }
       }
-      part { name: "knob"; repeat_events: 1;
+      part { name: "knob"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -1633,7 +1633,7 @@ group { name: "elm/slider/range/horizontal/default";
             color_class: "/fg/disabled/slider/knob";
          }
       }
-      part { name: "slideevent"; type: RECT; repeat_events: 1;
+      part { name: "slideevent"; type: RECT; repeat_events: 0;
          scale: 1;
          ignore_flags: ON_HOLD;
          dragable.events: "elm.dragable.slider";
@@ -1677,7 +1677,7 @@ group { name: "elm/slider/range/horizontal/default";
             rel2.to_x: "elm.swallow.bar";
          }
       }
-      part { name: "knob2"; repeat_events: 1;
+      part { name: "knob2"; mouse_events: 0;
          clip_to: "enable2";
          scale: 1;
          description { state: "default" 0.0;
@@ -1698,7 +1698,7 @@ group { name: "elm/slider/range/horizontal/default";
             color_class: "/fg/disabled/slider/knob";
          }
       }
-      part { name: "slideevent2"; type: RECT; repeat_events: 1;
+      part { name: "slideevent2"; type: RECT; repeat_events: 0;
          clip_to: "enable2";
          scale: 1;
          ignore_flags: ON_HOLD;
@@ -2298,7 +2298,7 @@ group { name: "elm/slider/range/vertical/default";
             rel2.to_y: "elm.swallow.bar";
          }
       }
-      part { name: "knob"; repeat_events: 1;
+      part { name: "knob"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -2317,7 +2317,7 @@ group { name: "elm/slider/range/vertical/default";
             color_class: "/fg/disabled/slider/knob";
          }
       }
-      part { name: "slideevent"; type: RECT; repeat_events: 1;
+      part { name: "slideevent"; type: RECT; repeat_events: 0;
          scale: 1;
          ignore_flags: ON_HOLD;
          dragable.events: "elm.dragable.slider";
@@ -2361,7 +2361,7 @@ group { name: "elm/slider/range/vertical/default";
             rel2.to_y: "elm.swallow.bar";
          }
       }
-      part { name: "knob2"; repeat_events: 1;
+      part { name: "knob2"; mouse_events: 0;
          clip_to: "enable2";
          scale: 1;
          description { state: "default" 0.0;
@@ -2381,7 +2381,7 @@ group { name: "elm/slider/range/vertical/default";
             color_class: "/fg/disabled/slider/knob";
          }
       }
-      part { name: "slideevent2"; type: RECT; repeat_events: 1;
+      part { name: "slideevent2"; type: RECT; repeat_events: 0;
          clip_to: "enable2";
          scale: 1;
          ignore_flags: ON_HOLD;

data/elementary/themes/edc/fileman.edc

@@ -77,6 +77,21 @@ group { name: "e/fileman/default/list/variable";
             inherit: "default" 0.0;
          }
       }
+      part { name: "icon_mono"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "icon";
+            color_class: "/fg/normal/grid/item";
+         }
+         description { state: "selected" 0.0;
+            color_class: "/fg/selected/grid/item";
+         }
+      }
+      part { name: "e.swallow.icon_mono"; type: SWALLOW; mouse_events: 0;
+         clip_to: "icon_mono";
+         description { state: "default" 0.0;
+            rel.to: "icon0";
+         }
+      }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          clip_to: "icon";
          description { state: "default" 0.0;
@@ -217,11 +232,13 @@ group { name: "e/fileman/default/list/variable";
          action: STATE_SET "selected" 0.0;
          target: "sel_base";
          target: "e.text.label";
+         target: "icon_mono";
       }
       program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "sel_base";
          target: "e.text.label";
+         target: "icon_mono";
       }
       program { signal: "mouse,down,1"; source: "label_event";
          script {
@@ -498,44 +515,37 @@ group { name: "e/fileman/default/fileperms";
       part { name: "type";
          scale: 1;
          description { state: "default" 0.0;
-            image.normal: "i-folder";
+            image.normal: "i-file";
             min: 15 15; max: 15 15;
             rel1.offset: 0 2;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "user-setuid";
             rel2.offset: -5 -3;
-            visible: 0;
             offscale;
          }
          description { state: "dir" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-folder";
-            visible: 1;
          }
          description { state: "link" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-arrow-r";
-            visible: 1;
          }
          description { state: "pipe" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-device-pipe";
-            visible: 1;
          }
          description { state: "socket" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-device-socket";
-            visible: 1;
          }
          description { state: "block" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-device-block";
-            visible: 1;
          }
          description { state: "char" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-device-char";
-            visible: 1;
          }
       }
       part { name: "user-middle"; type: SPACER;
@@ -1055,6 +1065,263 @@ group { name: "e/fileman/default/filedate";
    }
 }
 
+group { name: "e/fileman/default/check";
+   parts {
+      part { name: "base";
+         clip_to: "selected";
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "i-check";
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            min: 15 15;
+            max: 15 15;
+            visible: 0;
+            offscale;
+         }
+         description { state: "on" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "selected"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            color_class: "/fg/normal/fileman/item/check/check";
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/fg/selected/fileman/item/check/check";
+         }
+      }
+   }
+   programs {
+      program { signal: "e,state,selected"; source: "e";
+         action: STATE_SET "selected" 0.0;
+         target: "selected";
+      }
+      program { signal: "e,state,unselected"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "selected";
+      }
+      program { signal: "e,state,on"; source: "e";
+         action: STATE_SET "on" 0.0;
+         target: "base";
+      }
+      program { signal: "e,state,off"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "base";
+      }
+   }
+}
+
+group { name: "e/fileman/default/circle";
+  script {
+   hex(str[], len) {
+     new i, val = 0;
+
+     for (i = 0; i < len; i++) {
+       val <<= 4;
+       if        ((str[i] >= '0') && (str[i] <= '9')) {
+         val += str[i] - '0';
+       } else if ((str[i] >= 'a') && (str[i] <= 'f')) {
+         val += 10 + str[i] - 'a';
+       } else if ((str[i] >= 'A') && (str[i] <= 'F')) {
+         val += 10 + str[i] - 'A';
+       }
+     }
+     return val;
+   }
+   public message(Msg_Type:type, id, ...) {
+     if ((type == MSG_STRING) && (id == 1)) {
+       new cc[256];
+
+       getsarg(2, cc, 255);
+       custom_state(PART:"base", "default", 0.0);
+       if (!strncmp(cc, "cc:", 3)) {
+         strcpy(cc, cc[3]);
+         set_state_val(PART:"base", STATE_COLOR, 255, 255, 255, 255);
+         set_state_val(PART:"base", STATE_COLOR_CLASS, cc);
+       } else if (!strncmp(cc, "#", 1)) {
+         new r = 255, g = 255, b = 255, a = 255;
+
+         strcpy(cc, cc[1]);
+         if        (strlen(cc) == 3) { // #35a
+           r = hex(cc[0], 1);
+           g = hex(cc[1], 1);
+           b = hex(cc[2], 1);
+         } else if (strlen(cc) == 4) { // #35af
+           r = hex(cc[0], 1);
+           g = hex(cc[1], 1);
+           b = hex(cc[2], 1);
+           a = hex(cc[3], 1);
+         } else if (strlen(cc) == 6) { // #3355aa
+           r = hex(cc[0], 2);
+           g = hex(cc[2], 2);
+           b = hex(cc[4], 2);
+         } else if (strlen(cc) == 8) { // #3355aaff
+           r = hex(cc[0], 2);
+           g = hex(cc[2], 2);
+           b = hex(cc[4], 2);
+           a = hex(cc[6], 2);
+         }
+         set_state_val(PART:"base", STATE_COLOR, r, g, b, a);
+         set_state_val(PART:"base", STATE_COLOR_CLASS, "");
+       }
+       set_state(PART:"base", "custom", 0.0);
+     }
+   }
+  }
+  parts {
+    set { name: "file-circle-outline";
+      image { image: "speaker-clip-160.png"  COMP; size: 81 81 99999 99999; }
+      image { image: "speaker-clip-080.png"  COMP; size: 41 41 80 80 99999; }
+      image { image: "speaker-clip-040.png"  COMP; size:  0  0 40 40; }
+    }
+    part { name: "base"; mouse_events: 0;
+      scale: 1;
+      description { state: "default" 0.0;
+        min: 15 15;
+        max: 15 15;
+        rel1.offset: 3 3;
+        rel2.offset: -4 -4;
+        image.normal: "i-radio";
+        offscale;
+        fixed: 1 1;
+      }
+    }
+    part { name: "circle"; mouse_events: 0;
+      scale: 1;
+      description { state: "default" 0.0;
+        min: 17 17;
+        max: 17 17;
+        rel.to: "base";
+        image.normal: "file-circle-outline";
+        fixed: 1 1;
+        color_class: "/fg/selected/list/item";
+        visible: 0;
+      }
+      description { state: "selected" 0.0;
+        inherit: "default" 0.0;
+        visible: 1;
+      }
+    }
+  }
+  programs {
+    program { signal: "e,state,selected"; source: "e";
+      action: STATE_SET "selected" 0.0;
+      target: "circle";
+    }
+    program { signal: "e,state,unselected"; source: "e";
+      action: STATE_SET "default" 0.0;
+      target: "circle";
+    }
+  }
+}
+
+group { name: "e/fileman/default/graph/base";
+   parts {
+      part { name: "e.swallow.content"; type: SWALLOW; scale;
+         description { state: "default" 0.0; offscale;
+            rel1 { offset:  2  2; }
+            rel2 { offset: -3 -3; }
+         }
+      }
+   }
+}
+
+group { name: "e/fileman/default/graph/bar";
+  script {
+   hex(str[], len) {
+     new i, val = 0;
+
+     for (i = 0; i < len; i++) {
+       val <<= 4;
+       if        ((str[i] >= '0') && (str[i] <= '9')) {
+         val += str[i] - '0';
+       } else if ((str[i] >= 'a') && (str[i] <= 'f')) {
+         val += 10 + str[i] - 'a';
+       } else if ((str[i] >= 'A') && (str[i] <= 'F')) {
+         val += 10 + str[i] - 'A';
+       }
+     }
+     return val;
+   }
+   public message(Msg_Type:type, id, ...) {
+     if ((type == MSG_STRING) && (id == 1)) {
+       new cc[256];
+
+       getsarg(2, cc, 255);
+       custom_state(PART:"base", "default", 0.0);
+       if (!strncmp(cc, "cc:", 3)) {
+         strcpy(cc, cc[3]);
+         set_state_val(PART:"base", STATE_COLOR, 255, 255, 255, 255);
+         set_state_val(PART:"base", STATE_COLOR_CLASS, cc);
+       } else if (!strncmp(cc, "#", 1)) {
+         new r = 255, g = 255, b = 255, a = 255;
+
+         strcpy(cc, cc[1]);
+         if        (strlen(cc) == 3) { // #35a
+           r = hex(cc[0], 1);
+           g = hex(cc[1], 1);
+           b = hex(cc[2], 1);
+         } else if (strlen(cc) == 4) { // #35af
+           r = hex(cc[0], 1);
+           g = hex(cc[1], 1);
+           b = hex(cc[2], 1);
+           a = hex(cc[3], 1);
+         } else if (strlen(cc) == 6) { // #3355aa
+           r = hex(cc[0], 2);
+           g = hex(cc[2], 2);
+           b = hex(cc[4], 2);
+         } else if (strlen(cc) == 8) { // #3355aaff
+           r = hex(cc[0], 2);
+           g = hex(cc[2], 2);
+           b = hex(cc[4], 2);
+           a = hex(cc[6], 2);
+         }
+         set_state_val(PART:"base", STATE_COLOR, r, g, b, a);
+         set_state_val(PART:"base", STATE_COLOR_CLASS, "");
+       }
+       set_state(PART:"base", "custom", 0.0);
+     }
+   }
+  }
+   parts {
+      part { name: "drag_base"; type: SPACER; scale;
+         description { state: "default" 0.0; offscale;
+            rel1 { offset:  1  1; }
+            rel2 { offset: -2 -2; }
+         }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to_y: "e.dragable.value";
+            rel2.to: "drag_base";
+            color_class: "/fg/normal/filegraph/bar";
+         }
+      }
+      part { name: "top"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 0;
+            color_class: "/fg/normal/filegraph/bartop";
+         }
+      }
+      part { name: "e.dragable.value"; type: SPACER;
+         dragable.x: 0 0 0;
+         dragable.y: 1 1 0;
+         dragable.confine: "drag_base";
+         description { state: "default" 0.0;
+            min: 0 1;
+            max: 99999 1;
+            fixed: 1 1;
+         }
+      }
+   }
+}
+
 group { name: "e/fileman/default/list/detailed";
    inherit: "e/fileman/default/list/variable";
    parts {
@@ -1084,6 +1351,20 @@ group { name: "e/fileman/default/list/detailed";
             color_class: "/fg/disabled/list/item"; \
          } \
       }
+      part { name: "e.text.label";
+         description { state: "default" 0.0;
+            rel2.to_x: "e.swallow.detail1";
+            rel2.relative: 0.0 1.0;
+         }
+         description { state: "selected" 0.0;
+            rel2.to_x: "e.swallow.detail1";
+            rel2.relative: 0.0 1.0;
+         }
+         description { state: "disabled" 0.0;
+            rel2.to_x: "e.swallow.detail1";
+            rel2.relative: 0.0 1.0;
+         }
+      }
       DETAILTEXT("e.text.detail1", "e.swallow.detail1", "e.text.label")
       DETAILTEXT("e.text.detail2", "e.swallow.detail2", "e.text.detail1")
       DETAILTEXT("e.text.detail3", "e.swallow.detail3", "e.text.detail2")
@@ -1109,15 +1390,15 @@ group { name: "e/fileman/default/list/detailed";
          target: "e.text.detail5";
          target: "e.text.detail6";
       }
-      part { name: "e.swallow.detail6"; type: SWALLOW; nomouse; scale;
-         insert_after: "e.text.detail6";
+      part { name: "e.swallow.detail6"; type: SWALLOW; scale;
+         insert_after: "e.swallow.entry";
          description { state: "default" 0.0; offscale;
             align: 1.0 0.5; min: 15 5;
             rel1 { offset: -5  0; relative: 1.0 0.0; }
             rel2 { offset: -5 -1; relative: 1.0 1.0; }
          }
       }
-      part { name: "e.swallow.detail5"; type: SWALLOW; nomouse; scale;
+      part { name: "e.swallow.detail5"; type: SWALLOW; scale;
          insert_after: "e.swallow.detail6";
          description { state: "default" 0.0; offscale;
             align: 1.0 0.5; min: 20 5;
@@ -1125,7 +1406,7 @@ group { name: "e/fileman/default/list/detailed";
             rel2 { to_x: "e.swallow.detail6"; offset: -1 -1; relative: 0.0 1.0; }
          }
       }
-      part { name: "e.swallow.detail4"; type: SWALLOW; nomouse; scale;
+      part { name: "e.swallow.detail4"; type: SWALLOW; scale;
          insert_after: "e.swallow.detail5";
          description { state: "default" 0.0; offscale;
             align: 1.0 0.5; min: 20 5;
@@ -1133,7 +1414,7 @@ group { name: "e/fileman/default/list/detailed";
             rel2 { to_x: "e.swallow.detail5"; offset: -1 -1; relative: 0.0 1.0; }
          }
       }
-      part { name: "e.swallow.detail3"; type: SWALLOW; nomouse; scale;
+      part { name: "e.swallow.detail3"; type: SWALLOW; scale;
          insert_after: "e.swallow.detail4";
          description { state: "default" 0.0; offscale;
             align: 1.0 0.5; min: 20 5;
@@ -1141,7 +1422,7 @@ group { name: "e/fileman/default/list/detailed";
             rel2 { to_x: "e.swallow.detail4"; offset: -1 -1; relative: 0.0 1.0; }
          }
       }
-      part { name: "e.swallow.detail2"; type: SWALLOW; nomouse; scale;
+      part { name: "e.swallow.detail2"; type: SWALLOW; scale;
          insert_after: "e.swallow.detail3";
          description { state: "default" 0.0; offscale;
             align: 1.0 0.5; min: 20 5;
@@ -1149,7 +1430,7 @@ group { name: "e/fileman/default/list/detailed";
             rel2 { to_x: "e.swallow.detail3"; offset: -1 -1; relative: 0.0 1.0; }
          }
       }
-      part { name: "e.swallow.detail1"; type: SWALLOW; nomouse; scale;
+      part { name: "e.swallow.detail1"; type: SWALLOW; scale;
          insert_after: "e.swallow.detail2";
          description { state: "default" 0.0; offscale;
             align: 1.0 0.5; min: 20 5;
@@ -1157,20 +1438,6 @@ group { name: "e/fileman/default/list/detailed";
             rel2 { to_x: "e.swallow.detail2"; offset: -1 -1; relative: 0.0 1.0; }
          }
       }
-      part { name: "e.text.label";
-         description { state: "default" 0.0;
-            rel2.to_x: "e.swallow.detail1";
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "selected" 0.0;
-            rel2.to_x: "e.swallow.detail1";
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "disabled" 0.0;
-            rel2.to_x: "e.swallow.detail1";
-            rel2.relative: 0.0 1.0;
-         }
-      }
    }
 }
 
@@ -1306,6 +1573,21 @@ group { name: "e/fileman/default/icon/fixed";
             inherit: "default" 0.0;
          }
       }
+      part { name: "icon_mono"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "icon";
+            color_class: "/fg/normal/grid/item";
+         }
+         description { state: "selected" 0.0;
+            color_class: "/fg/selected/grid/item";
+         }
+      }
+      part { name: "e.swallow.icon_mono"; type: SWALLOW; mouse_events: 0;
+         clip_to: "icon_mono";
+         description { state: "default" 0.0;
+            rel.to: "icon0";
+         }
+      }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          clip_to: "icon";
          description { state: "default" 0.0;
@@ -1451,11 +1733,13 @@ group { name: "e/fileman/default/icon/fixed";
          action: STATE_SET "selected" 0.0;
          target: "e.text.label";
          target: "base";
+         target: "icon_mono";
       }
       program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
          target: "base";
+         target: "icon_mono";
       }
       program { signal: "mouse,down,1"; source: "label_event";
          script {

data/elementary/themes/edc/icons.edc

@@ -734,6 +734,9 @@ ICON("fprint", "i-fingerprint")
 
 ICON("person-bust", "i-person-bust")
 
+ICON("state-radio", "i-radio")
+ICON("state-check", "i-check")
+
 #undef ICON
 
 // regular icons
@@ -748,6 +751,7 @@ ICON("person-bust", "i-person-bust")
          } \
       } \
    }
+
 ICON("folder", "i-folder")
 ICON("file", "i-file")
 ICON("clock", "i-clock")
@@ -885,6 +889,7 @@ ICON("preferences-desktop-screensaver", "i-screen")
 ICON("preferences-desktop-wallpaper", "i-picture-landscape")
 ICON("preferences-system", "i-gear")
 ICON("preferences-other", "i-gear-spanner")
+ICON("preferences-etc", "i-utilities")
 ICON("system-file-manager", "i-folder")
 ICON("applications-accessories", "i-scissor-rule")
 ICON("applications-development", "i-gear-curly-braces")

data/elementary/themes/edc/winlist.edc

@@ -1,3 +1,9 @@
+// Define this to enable blur background to winlist
+//#define BLUR_WINLIST 1
+
+// Some values used if blur is enabled
+#define BLUR_WINLIST_AMOUNT "48"
+
 group { name: "e/widgets/winlist/main";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
@@ -270,27 +276,27 @@ group { name: "e/widgets/winlist/large/bg";
             color: 255 255 255 255; // no cc
          }
       }
-/*
+#ifdef BLUR_WINLIST
       snapshot { "bg_blur";
          clip_to: "bg_clip";
          description { state: "default" 0.0;
-            filter.code: "padding_set { 0 } blur { state.pos * 50, color = '#ffff' }";
+            filter.code: "padding_set { 0 } blur { state.pos * "BLUR_WINLIST_AMOUNT", color = '#ffff' }";
             visible: 0;
          }
          desc { state: "visible" 0.0;
             inherit: "default" 0.0;
-            filter.code: "padding_set { 0 } blur { (1.0 - state.pos) * 50, color = '#ffff' }";
+            filter.code: "padding_set { 0 } blur { (1.0 - state.pos) * "BLUR_WINLIST_AMOUNT", color = '#ffff' }";
             visible: 1;
          }
       }
- */
+#endif
       part { name: "bg_darken"; type: RECT;
          clip_to: "bg_clip";
          description { state: "default" 0.0;
             color_class: "/dim/normal/winlist/base";
          }
       }
-/*
+#ifdef BLUR_WINLIST
       part { name: "shadow"; mouse_events: 0;
          clip_to: "bg_clip";
          description { state: "default" 0.0;
@@ -298,26 +304,26 @@ group { name: "e/widgets/winlist/large/bg";
             rel2.relative: 2.0 2.0;
             image.normal: "screen_circular_shadow.png";
             fill.smooth: 0;
-            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
- */
+#endif
    }
    programs {
       program { signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.2 USE_DURATION_FACTOR 1 CURRENT;
          target: "bg_clip";
-//         target: "bg_blur";
-//         target: "shadow";
+#ifdef BLUR_WINLIST
+         target: "bg_blur";
+         target: "shadow";
+#endif
          after: "show2";
       }
       program { name: "show2";
@@ -327,8 +333,10 @@ group { name: "e/widgets/winlist/large/bg";
          action: STATE_SET "default" 0.0;
          transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1 CURRENT;
          target: "bg_clip";
-//         target: "bg_blur";
-//         target: "shadow";
+#ifdef BLUR_WINLIST
+         target: "bg_blur";
+         target: "shadow";
+#endif
          after: "hide2";
       }
       program { name: "hide2";

data/elementary/themes/ic.edc

@@ -360,7 +360,7 @@ I160("i-monitor-speakers", "monitor-speakers")
 I160("i-briefcase", "briefcase")
 I160("i-app-window", "app-window")
 I160("i-beaker", "beaker")
-// not used yet I160("i-utilities", "utilities")
+I160("i-utilities", "utilities")
 I160("i-sun", "sun")
 I160("i-moon", "moon")
 I160("i-moon-clouds", "moon-clouds")

meson.build

@@ -1,5 +1,5 @@
 project('efl', ['c','cpp'],
-  version: '1.26.99',
+  version: '1.27.99',
   default_options : ['buildtype=plain', 'warning_level=1', 'cpp_std=c++11'],
   meson_version : '>=0.50'
 )
@@ -118,6 +118,7 @@ if sys_windows
     error('Version of targetted Windows incorrect')
   endif
   add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: langs)
+  add_global_arguments('-define:WIN32', language: 'cs')
 endif
 
 if sys_sun
@@ -218,6 +219,10 @@ else
   error('System ' + host_machine.system() + ' not known')
 endif
 
+if sys_linux or sys_bsd or sys_sun
+  config_h.set('_STAT_VER_LINUX', '1')
+endif
+
 if host_os == 'freebsd' or host_os == 'dragonfly'
   # This is necessary. We MUST use OpenSSL in base as bringing in from ports
   # can cause major issues (2 copies of the same library).
@@ -613,9 +618,11 @@ foreach evas_loader_map_inst : evas_loader_map
   meson.add_install_script('meson/evas_loader_conf.sh', evas_loader_original, evas_loader_link_types)
 endforeach
 
-doxygen = find_program('doxygen', required : false)
-
-if doxygen.found()
+doxygen = find_program('doxygen', required : get_option('docs'))
+if get_option('docs')
+  if not doxygen.found()
+    error('Need doxygen for docs')
+  endif
   subdir('doc')
 endif
 

meson_options.txt

@@ -330,7 +330,7 @@ option('dotnet',
 option('lua-interpreter',
   type: 'combo',
   choices: ['luajit', 'lua'],
-  value: 'luajit',
+  value: 'lua',
   description: 'Which Lua back-end library to use in efl'
 )
 
@@ -382,3 +382,15 @@ option('max-fd-size',
   value : '8192',
   description : 'This is the maximim set of fds and thus maximum fd value allowed +1 in the ecore main loop handler'
 )
+
+option('docs',
+  type: 'boolean',
+  value: false,
+  description: 'Enable building C of documentation (Requires doxygen)'
+)
+
+option('embedded-libunibreak',
+  type : 'boolean',
+  value : true,
+  description : 'Use the embedded in-tree libunibreak instead of the system libunibreak.'
+)

po/LINGUAS

@@ -1 +1 @@
-ar az_IR ca cs da de el eo es fa fi fr gl he hu it ja ko_KR ko lt nl pl ps pt ru sl sr tr ur vi yi zh_CN
+ar az_IR ca cs da de el eo es fa fi fr gl he hu it ja ka ko_KR ko lt nl pl ps pt ru sl sr tr ur vi yi zh_CN

po/ka.po

@@ -0,0 +1,276 @@
+# Georgian translation for Efl.
+# Copyright (C) 2022 Enlightenment development team
+# This file is put in the public domain.
+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: elementary 1.11\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-04-19 16:13+0200\n"
+"PO-Revision-Date: 2022-10-25 10:16+0200\n"
+"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
+"Language-Team: Georgian <(nothing)>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.2\n"
+
+#: src/lib/ecore/ecore_getopt.c:85
+msgid "Version:"
+msgstr "ვერსია:"
+
+#: src/lib/ecore/ecore_getopt.c:94
+msgid "Usage:"
+msgstr "გამოყენება:"
+
+#: src/lib/ecore/ecore_getopt.c:101
+#, c-format
+msgid "%s [options]"
+msgstr "%s [პარამეტრები]"
+
+#: src/lib/ecore/ecore_getopt.c:301
+msgid "Copyright:"
+msgstr "უფლებები:"
+
+#: src/lib/ecore/ecore_getopt.c:313
+msgid "License:"
+msgstr "ლიცენზია:"
+
+#: src/lib/ecore/ecore_getopt.c:499
+msgid "Type: "
+msgstr "ტიპი: "
+
+#: src/lib/ecore/ecore_getopt.c:575
+msgid "Default: "
+msgstr "ნაგულისხმები: "
+
+#: src/lib/ecore/ecore_getopt.c:602
+msgid "Choices: "
+msgstr "არჩევანი: "
+
+#: src/lib/ecore/ecore_getopt.c:640 src/lib/ecore/ecore_getopt.c:641
+msgid "No categories available."
+msgstr "კატეგორიები ხელმიუწვდომელია."
+
+#: src/lib/ecore/ecore_getopt.c:645
+msgid "Categories: "
+msgstr "კატეგორიები: "
+
+#: src/lib/ecore/ecore_getopt.c:767
+msgid "Options:\n"
+msgstr "პარამეტრები:\n"
+
+#: src/lib/ecore/ecore_getopt.c:776
+msgid "Positional arguments:\n"
+msgstr "პოზიციური არგუმენტები:\n"
+
+#: src/lib/ecore/ecore_getopt.c:843
+#, c-format
+msgid "ERROR: unknown category '%s'.\n"
+msgstr "შეცდომა: უცნობი კატეგორია '%s'.\n"
+
+#: src/lib/ecore/ecore_getopt.c:947
+#, c-format
+msgid "ERROR: unknown option --%s.\n"
+msgstr "შეცდომა: უცნობი პარამეტრი --%s.\n"
+
+#: src/lib/ecore/ecore_getopt.c:949
+#, c-format
+msgid "ERROR: unknown option -%c.\n"
+msgstr "შეცდომა: უცნობი პარამეტრი -%c.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1012
+msgid "ERROR: "
+msgstr "შეცდომა: "
+
+#: src/lib/ecore/ecore_getopt.c:1108 src/lib/ecore/ecore_getopt.c:1245
+#: src/lib/ecore/ecore_getopt.c:1261 src/lib/ecore/ecore_getopt.c:1276
+#: src/lib/ecore/ecore_getopt.c:1296 src/lib/ecore/ecore_getopt.c:1343
+#: src/lib/ecore/ecore_getopt.c:1463 src/lib/ecore/ecore_getopt.c:1504
+msgid "value has no pointer set.\n"
+msgstr "მნიშვნელობას მაჩვენებელი დაყენებული არ აქვს.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1140 src/lib/ecore/ecore_getopt.c:1363
+#, c-format
+msgid "unknown boolean value %s.\n"
+msgstr "უცნობი ლოგიკური მნიშვნელობა %s.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1191 src/lib/ecore/ecore_getopt.c:1451
+#, c-format
+msgid "invalid number format %s\n"
+msgstr "რიცხვის არასწორი ფორმატი %s\n"
+
+#: src/lib/ecore/ecore_getopt.c:1309
+#, c-format
+msgid "invalid choice \"%s\". Valid values are: "
+msgstr "არასწორი არჩევანი \"%s\". სწორი მნიშვნელობებია: "
+
+#: src/lib/ecore/ecore_getopt.c:1337
+msgid "missing parameter to append.\n"
+msgstr "მისაწერი გამორჩენილი პარამეტრი.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1441
+msgid "could not parse value.\n"
+msgstr "მნიშვნელობის დამუშავების შეცდომა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1498
+msgid "missing parameter.\n"
+msgstr "ნაკლული პარამეტრი.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1511
+msgid "missing callback function!\n"
+msgstr "ნაკლული უკუგამოძახების ფუნქცია!\n"
+
+#: src/lib/ecore/ecore_getopt.c:1542
+msgid "no version was defined.\n"
+msgstr "ვერსია აღწერილი არაა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1559
+msgid "no copyright was defined.\n"
+msgstr "საავტორო უფლებები აღწერილი არაა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1576
+msgid "no license was defined.\n"
+msgstr "ლიცენზია აღწერილი არაა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1666
+#, c-format
+msgid "ERROR: unknown option --%s, ignored.\n"
+msgstr "შეცდომა: უცნობი პარამეტრი --%s. იგნორირებულია.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1706
+#, c-format
+msgid "ERROR: option --%s requires an argument!\n"
+msgstr "შეცდომა: პარამეტრისთვის --%s არგუმენტი აუცილებელია!\n"
+
+#: src/lib/ecore/ecore_getopt.c:1748
+#, c-format
+msgid "ERROR: unknown option -%c, ignored.\n"
+msgstr "შეცდომა: უცნობი პარამეტრი -%c, იგნორირებულია.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1793
+#, c-format
+msgid "ERROR: option -%c requires an argument!\n"
+msgstr "შეცდომა: პარამეტრისთვის -%c არგუმენტი აუცილებელია!\n"
+
+#: src/lib/ecore/ecore_getopt.c:1888
+#, c-format
+msgid "ERROR: missing required positional argument %s.\n"
+msgstr "შეცდომა: ნაკლული აუცილებელი პოზიციური არგუმენტი %s.\n"
+
+#: src/lib/ecore/ecore_getopt.c:1920
+#, c-format
+msgid "ERROR: unsupported action type %d for positional argument %s\n"
+msgstr ""
+"შეცდომა: ქმედების მხარდაუჭერელი ტიპი (%d) პოზიციური არგუმენტისთვის %s\n"
+
+#: src/lib/ecore/ecore_getopt.c:2041 src/lib/ecore/ecore_getopt.c:2107
+msgid "ERROR: no parser provided.\n"
+msgstr "შეცდომა: დამმუშავებელი მოწოდებული არაა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:2046 src/lib/ecore/ecore_getopt.c:2112
+msgid "ERROR: no values provided.\n"
+msgstr "შეცდომა: მნიშვნელობები მითითებული არაა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:2055 src/lib/ecore/ecore_getopt.c:2121
+msgid "ERROR: no arguments provided.\n"
+msgstr "შეცდომა: არგუმენტები მითითებული არაა.\n"
+
+#: src/lib/ecore/ecore_getopt.c:2081
+msgid "ERROR: invalid options found."
+msgstr "შეცდომა: აღმოჩენილია არასწორი პარამეტრები."
+
+#: src/lib/ecore/ecore_getopt.c:2087 src/lib/ecore/ecore_getopt.c:2154
+#, c-format
+msgid " See --%s.\n"
+msgstr " იხილეთ --%s.\n"
+
+#: src/lib/ecore/ecore_getopt.c:2089 src/lib/ecore/ecore_getopt.c:2156
+#, c-format
+msgid " See -%c.\n"
+msgstr " იხილეთ -%c.\n"
+
+#: src/lib/ecore/ecore_getopt.c:2148
+msgid "ERROR: invalid positional arguments found."
+msgstr "შეცდომა: ნაპოვნია არასწორი პოზიციური არგუმენტები."
+
+#: src/lib/ecore/ecore_getopt.c:2183
+#, c-format
+msgid "ERROR: incorrect geometry value '%s'\n"
+msgstr "შეცდომა: გეომეტრიის არასწორი მნიშვნელობა '%s'\n"
+
+#: src/lib/ecore/ecore_getopt.c:2201
+#, c-format
+msgid "ERROR: incorrect size value '%s'\n"
+msgstr "შეცდომა: ზომის არასწორი მნიშვნელობა '%s'\n"
+
+#: src/lib/efreet/efreet_base.c:127
+msgid "Desktop"
+msgstr "სამუშაო მაგიდა"
+
+#: src/lib/efreet/efreet_base.c:135
+msgid "Downloads"
+msgstr "გადმოწერები"
+
+#: src/lib/efreet/efreet_base.c:144
+msgid "Templates"
+msgstr "შაბლონები"
+
+#: src/lib/efreet/efreet_base.c:153
+msgid "Public"
+msgstr "საჯარო"
+
+#: src/lib/efreet/efreet_base.c:162
+msgid "Documents"
+msgstr "დოკუმენტები"
+
+#: src/lib/efreet/efreet_base.c:170
+msgid "Music"
+msgstr "მუსიკა"
+
+#: src/lib/efreet/efreet_base.c:178
+msgid "Pictures"
+msgstr "სურათები"
+
+#: src/lib/efreet/efreet_base.c:186
+msgid "Videos"
+msgstr "ვიდეო"
+
+#: src/lib/evas/common/language/evas_language_utils.c:205
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: src/lib/elementary/elc_naviframe.c:408
+msgid "Title"
+msgstr "სათაური"
+
+#: src/lib/elementary/elc_naviframe.c:415
+msgid "Subtitle"
+msgstr "სუბტიტრები"
+
+#: src/lib/elementary/elc_naviframe.c:966
+msgid "Back"
+msgstr "უკან"
+
+#: src/lib/elementary/elc_fileselector.c:1755
+msgid "Up"
+msgstr "მაღლა"
+
+#: src/lib/elementary/elc_fileselector.c:1769
+msgid "Home"
+msgstr "საწყისი"
+
+#: src/lib/elementary/elc_fileselector.c:1787
+msgid "Search"
+msgstr "ძებნა"
+
+#: src/lib/elementary/elc_fileselector.c:2061
+msgid "OK"
+msgstr "დიახ"
+
+#: src/lib/elementary/elc_fileselector.c:2070
+msgid "Cancel"
+msgstr "გაუქმება"
+

po/pt.po

@@ -1,22 +1,23 @@
 # Portuguese translation for Efl.
 # Copyright (C) 2012 Enlightenment development team
 # This file is public domain.
-# Sérgio Marques <smarquespt@gmail.com>, 2010-2014
+# Sérgio Marques <smarquespt@gmail.com>, 2010-2014.
+# Hugo Carvalho <hugokarvalho@hotmail.com> 2021-2022.
 #
-#: src/lib/elementary/elm_config.c:4267
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-19 16:13+0200\n"
-"PO-Revision-Date: 2013-11-05 14:11-0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
-"Language-Team: General\n"
+"PO-Revision-Date: 2022-10-02 22:21+0100\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1.1\n"
 "X-Launchpad-Export-Date: 2012-12-07 16:20+0000\n"
 
 #: src/lib/ecore/ecore_getopt.c:85
@@ -30,7 +31,7 @@ msgstr "Utilização:"
 #: src/lib/ecore/ecore_getopt.c:101
 #, c-format
 msgid "%s [options]"
-msgstr "%s [opções]"
+msgstr "%s [options]"
 
 #: src/lib/ecore/ecore_getopt.c:301
 msgid "Copyright:"
@@ -42,15 +43,15 @@ msgstr "Licença:"
 
 #: src/lib/ecore/ecore_getopt.c:499
 msgid "Type: "
-msgstr "Tipo:"
+msgstr "Tipo: "
 
 #: src/lib/ecore/ecore_getopt.c:575
 msgid "Default: "
-msgstr "Padrão:"
+msgstr "Padrão: "
 
 #: src/lib/ecore/ecore_getopt.c:602
 msgid "Choices: "
-msgstr "Escolhas:"
+msgstr "Escolhas: "
 
 #: src/lib/ecore/ecore_getopt.c:640 src/lib/ecore/ecore_getopt.c:641
 msgid "No categories available."
@@ -58,7 +59,7 @@ msgstr "Nenhuma categoria disponível."
 
 #: src/lib/ecore/ecore_getopt.c:645
 msgid "Categories: "
-msgstr "Categorias:"
+msgstr "Categorias: "
 
 #: src/lib/ecore/ecore_getopt.c:767
 msgid "Options:\n"
@@ -107,7 +108,7 @@ msgstr "formato numérico inválido %s\n"
 #: src/lib/ecore/ecore_getopt.c:1309
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
-msgstr "escolha inválida \"%s\". O valores possíveis são:"
+msgstr "escolha inválida \"%s\". O valores possíveis são: "
 
 #: src/lib/ecore/ecore_getopt.c:1337
 msgid "missing parameter to append.\n"
@@ -186,12 +187,12 @@ msgstr "ERRO: encontradas opções inválidas."
 #: src/lib/ecore/ecore_getopt.c:2087 src/lib/ecore/ecore_getopt.c:2154
 #, c-format
 msgid " See --%s.\n"
-msgstr "Consulte --%s.\n"
+msgstr " Veja --%s.\n"
 
 #: src/lib/ecore/ecore_getopt.c:2089 src/lib/ecore/ecore_getopt.c:2156
 #, c-format
 msgid " See -%c.\n"
-msgstr "Consulte -%c.\n"
+msgstr " Veja -%c.\n"
 
 #: src/lib/ecore/ecore_getopt.c:2148
 msgid "ERROR: invalid positional arguments found."
@@ -241,20 +242,19 @@ msgstr "Vídeos"
 
 #: src/lib/evas/common/language/evas_language_utils.c:205
 msgid "default:LTR"
-msgstr "default:LTR"
+msgstr "padrão: LTR (da esquerda para a direita)"
 
 #: src/lib/elementary/elc_naviframe.c:408
 msgid "Title"
 msgstr "Título"
 
 #: src/lib/elementary/elc_naviframe.c:415
-#, fuzzy
 msgid "Subtitle"
-msgstr "Título"
+msgstr "Legenda"
 
 #: src/lib/elementary/elc_naviframe.c:966
 msgid "Back"
-msgstr "Recuar"
+msgstr "Voltar"
 
 #: src/lib/elementary/elc_fileselector.c:1755
 msgid "Up"
@@ -266,7 +266,7 @@ msgstr "Pasta pessoal"
 
 #: src/lib/elementary/elc_fileselector.c:1787
 msgid "Search"
-msgstr ""
+msgstr "Procurar"
 
 #: src/lib/elementary/elc_fileselector.c:2061
 msgid "OK"

src/bin/edje/meson.build

@@ -43,9 +43,9 @@ if meson.is_cross_build()
   edje_depends = []
 else
   if sys_windows == true
-    edje_cc_exe = [edje_cc.full_path()]
+    edje_cc_exe = [edje_cc]
   else
-    edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
+    edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc]
   endif
   edje_depends = [edje_cc, epp, evas_engine_buffer_mod, embryo_cc]
 endif
@@ -97,7 +97,7 @@ if meson.is_cross_build()
   edje_codegen_path = _edje_codegen.path()
   edje_codegen_exe = [_edje_codegen]
 else
-  edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()]
+  edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen]
 endif
 
 edje_pick = executable('edje_pick',

src/bin/eet/vieet

@@ -68,7 +68,7 @@ do
     if [ $? -ne 0 ]; then
         echo "Failed compiling eet file."
         echo "Press 'Return' to reopen the editor, or ^C to abort."
-        read
+        read _dummy
     else
         DONE=1
     fi

src/bin/elementary/config.c

@@ -2455,7 +2455,8 @@ _status_config_icons(Evas_Object *win,
         ic = elm_icon_add(li);
         elm_image_file_set(ic, efreet_icon_path_find(th->name.internal, "folder", 48), NULL);
         list_it = elm_list_item_append(li, th->name.name, ic, NULL,
-                                       _icon_theme_sel, th->name.internal);
+                                       _icon_theme_sel,
+                                       eina_stringshare_add(th->name.internal));
 
         if (!strcmp(th->name.internal, "hicolor"))
           def_it = list_it;
@@ -3375,7 +3376,7 @@ _profiles_list_unselect_cb(void *data       EINA_UNUSED,
                            Evas_Object     *obj,
                            void *event_info EINA_UNUSED)
 {
-   if (elm_list_selected_item_get(obj)) return;
+   if (!elm_list_selected_item_get(obj)) return;
    elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"),
                            EINA_TRUE);
    elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"),
@@ -4085,9 +4086,9 @@ _status_config_scrolling(Evas_Object *win,
    evas_object_smart_callback_add(sl, "delay,changed", smooth_win_change, NULL);
 
 
-   evas_object_data_set(win, "scrolling", sc);
+   evas_object_data_set(win, "scrolling", bx);
 
-   elm_naviframe_item_simple_push(naviframe, sc);
+   elm_naviframe_item_simple_push(naviframe, bx);
 }
 
 static void
@@ -4382,11 +4383,16 @@ _status_config_full(Evas_Object *win,
                            "Audio", _cf_audio, win);
    elm_toolbar_item_append(tb, "preferences-profile",
                            "Profiles", _cf_profiles, win);
-   elm_toolbar_item_append(tb, NULL, "Scrolling", _cf_scrolling, win);
-   elm_toolbar_item_append(tb, NULL, "Rendering", _cf_rendering, win);
-   elm_toolbar_item_append(tb, NULL, "Caches", _cf_caches, win);
-   elm_toolbar_item_append(tb, NULL, "Focus", _cf_focus, win);
-   elm_toolbar_item_append(tb, NULL, "Etc", _cf_etc, win);
+   elm_toolbar_item_append(tb, "system-run", 
+                           "Scrolling", _cf_scrolling, win);
+   elm_toolbar_item_append(tb, "preferences-desktop", 
+                           "Rendering", _cf_rendering, win);
+   elm_toolbar_item_append(tb, "appointment-new", 
+                           "Caches", _cf_caches, win);
+   elm_toolbar_item_append(tb, "magnifying-glass", 
+                           "Focus", _cf_focus, win);
+   elm_toolbar_item_append(tb, "preferences-etc", 
+                           "Etc", _cf_etc, win);
 
    elm_box_pack_end(bx0, tb);
    evas_object_show(tb);

src/bin/elementary/test_focus.c

@@ -497,7 +497,7 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
      }
 
      {
-        Evas_Object *rd, *rdg;
+        Evas_Object *rd, *rdg = NULL;
 
         for (i = 0; i < 3; i++)
           {

src/bin/elementary/test_radio.c

@@ -36,7 +36,8 @@ _group_1_create(Evas_Object *bx, const char *style)
 
    // radio 1
    ic = elm_icon_add(bx2);
-   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
+   elm_icon_standard_set(ic, "menu/folder");
+//   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
@@ -217,5 +218,14 @@ test_radio(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    _group_1_create(bx, "icon");
    _group_2_create(bx, "icon");
 
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_box_horizontal_set(bx, EINA_TRUE);
+   elm_box_pack_end(bx0, bx);
+   evas_object_show(bx);
+
+   _group_1_create(bx, "sort_header");
+   _group_2_create(bx, "sort_header");
+
    evas_object_show(win);
 }

src/bindings/mono/efl_mono/meson.build

@@ -14,17 +14,25 @@ map = run_command('map_generate.sh').stdout()
 
 efl_libs = configuration_data()
 efl_libs.set('EFL_MONO_LIBRARY_MAP', map)
-efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'eflcustomexportsmono')
 efl_libs.set('EVIL_DL_MONO', 'dl')
 if sys_osx
   efl_libs.set('LIBDL_DL_MONO', 'dl.dylib')
+  efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'eflcustomexportsmono')
+elif sys_windows
+  efl_libs.set('LIBDL_DL_MONO', 'libdl.dll')
+  efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'libeflcustomexportsmono' + '-' + version_major)
 else
   efl_libs.set('LIBDL_DL_MONO', 'libdl.so')
+  efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'eflcustomexportsmono')
 endif
 
 foreach mono_libs : mono_sublibs
   key = mono_libs[0].to_upper()+'_DL_MONO'
-  efl_libs.set(key, mono_libs[0].to_lower())
+  if target_machine.system() == 'windows'
+    efl_libs.set(key, 'lib' + mono_libs[0].to_lower() + '-' + version_major)
+  else
+    efl_libs.set(key, mono_libs[0].to_lower())
+  endif
 endforeach
 
 configure_file(

src/bindings/mono/efl_sharp.csproj.in

@@ -17,12 +17,13 @@
   <!-- </PropertyGroup> -->
   <PropertyGroup>
     <DefineConstants>@EFL_BETA@</DefineConstants>
+    <DefineConstants>@EFL_WIN32@</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="@BINDING_SRC@/efl_mono/*.cs" />
     <!-- FIXME Windows support -->
-    <Compile Include="@BINDING_SRC@/eo_mono/*.cs" Exclude="@BINDING_SRC@/eo_mono/*Windows.cs" />
+    <Compile Include="@BINDING_SRC@/eo_mono/*.cs" />
     <Compile Include="@BINDING_SRC@/eina_mono/*.cs" />
     <Compile Include="@BINDING_SRC@/eolian_mono/*.cs" />
     <Compile Include="@BINDING_SRC@/eldbus_mono/*.cs" />

src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !WIN32
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -40,3 +42,5 @@ internal static partial class FunctionInterop
 }
 
 }
+
+#endif

src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs

@@ -13,19 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if WIN32
+
 using System;
 using System.Runtime.InteropServices;
 
 namespace Efl.Eo
 {
 
-static partial class FunctionInterop
+internal static partial class FunctionInterop
 {
-    [DllImport(efl.Libs.Libdl)]
+    [DllImport(efl.Libs.Kernel32, CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
     internal static extern IntPtr GetProcAddress(IntPtr handle, string symbol);
 
-    private static IntPtr LoadFunctionPointer(IntPtr nativeLibraryHandle, string functionName)
-        => FunctionInterop.GetProcAddress(nativeLibraryHandle, functionName);
+    private static IntPtr dlsym(IntPtr handle, string symbol) => FunctionInterop.GetProcAddress(handle, symbol);
+
+    internal static IntPtr LoadFunctionPointer(IntPtr nativeLibraryHandle, string functionName) =>
+        FunctionInterop.GetProcAddress(nativeLibraryHandle, functionName);
 }
 
 }
+
+#endif

src/bindings/mono/eo_mono/NativeModule_Unix.cs

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !WIN32
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -98,3 +100,5 @@ internal partial class NativeModule
 }
 
 }
+
+#endif

src/bindings/mono/eo_mono/NativeModule_Windows.cs

@@ -13,16 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if WIN32
+
 using System;
 using System.Runtime.InteropServices;
 
 namespace Efl.Eo
 {
 
-internal class partial NativeModule
+internal partial class NativeModule
 {
-   [DllImport(efl.Libs.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]
-   internal static extern IntPtr LoadLibrary(string libFilename);
+    [DllImport(efl.Libs.Kernel32, EntryPoint = "LoadLibrary", CharSet = CharSet.Unicode, SetLastError = true)]
+    private static extern IntPtr _LoadLibrary(string libFilename);
+
+    internal static IntPtr LoadLibrary(string libFilename)
+    {
+        if (!libFilename.StartsWith("lib"))
+        {
+                libFilename = "lib" + libFilename + "-1";
+        }
+        return NativeModule._LoadLibrary(libFilename);
+    }
+
+    [DllImport(efl.Libs.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]
+    internal static extern void UnloadLibrary(IntPtr handle);
 }
 
 }
+
+#endif

src/bindings/mono/eo_mono/iwrapper.cs

@@ -81,7 +81,7 @@ internal static class Globals
         efl_ref(IntPtr eo);
     internal delegate  void
         efl_unref_delegate(IntPtr eo);
-    [DllImport(efl.Libs.CustomExports)] internal static extern void
+    [DllImport(efl.Libs.Eo)] internal static extern void
         efl_unref(IntPtr eo);
     internal delegate  int
         efl_ref_count_delegate(IntPtr eo);

src/bindings/mono/eo_mono/meson.build

@@ -4,11 +4,9 @@ mono_files += files(
   'FunctionWrapper.cs',
   'NativeModule.cs',
   'EoWrapper.cs',
-  'WrapperSupervisor.cs'
+  'WrapperSupervisor.cs',
+  'FunctionWrapper_Windows.cs',
+  'NativeModule_Windows.cs',
+  'FunctionWrapper_Unix.cs',
+  'NativeModule_Unix.cs'
 )
-
-if host_machine.system() == 'windows'
-   mono_files += files('FunctionWrapper_Windows.cs', 'NativeModule_Windows.cs')
-else
-   mono_files += files('FunctionWrapper_Unix.cs', 'NativeModule_Unix.cs')
-endif

src/bindings/mono/eolian_mono/meson.build

@@ -1,3 +1,7 @@
+cmake = import('cmake')
+opt_var = cmake.subproject_options()
+opt_var.set_override_option('cpp_std', 'c++17')
+
 inc_dir = include_directories(join_paths('..', '..', '..', 'bin', 'eolian_mono'))
 
 eolian_mono_gen_bin = executable('eolian_mono',

src/bindings/mono/meson.build

@@ -81,6 +81,11 @@ foreach lib : mono_sublibs
   package_name = lib[0].to_lower()
   eo_file_subdirs = get_variable(package_name + '_eo_subdirs')
   file_location = join_paths('..', '..', 'lib', package_name)
+  dllimport = package_name
+
+  if target_machine.system() == 'windows'
+    dllimport = 'lib' + dllimport + '-' + version_major
+  endif
 
   if (package_name != 'eldbus')
     foreach eo_file_subdir : eo_file_subdirs
@@ -101,7 +106,7 @@ foreach lib : mono_sublibs
             input : join_paths(subdir_file_location, mono_gen_file),
             output : [mono_gen_file + '.cs'],
             command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
-                                       '--dllimport', package_name,
+                                       '--dllimport', dllimport,
                                        '-o', join_paths(meson.current_build_dir(), mono_gen_file + '.cs'),
                                        '-e', get_option('mono-examples-dir'), partial,
                                        '@INPUT@'])
@@ -211,7 +216,22 @@ if (get_option('dotnet'))
   # The major version should be enough for now while we don't have to deal
   # with minor differences and dotnet core is far from version 10
   dotnet_major_version = dotnet_version.stdout().strip()[0].to_int()
-  if dotnet_major_version == 3
+  if dotnet_major_version == 8
+    dotnet_core_app_version = '8.0'
+    dotnet_standard_version = '2.1'
+  elif dotnet_major_version == 7
+    dotnet_core_app_version = '7.0'
+    dotnet_standard_version = '2.1'
+  elif dotnet_major_version == 6
+    dotnet_core_app_version = '6.0'
+    dotnet_standard_version = '2.1'
+  elif dotnet_major_version == 5
+    dotnet_core_app_version = '5.0'
+    dotnet_standard_version = '2.1'
+  elif dotnet_major_version == 4
+    dotnet_core_app_version = '4.0'
+    dotnet_standard_version = '2.1'
+  elif dotnet_major_version == 3
     dotnet_core_app_version = '3.0'
     dotnet_standard_version = '2.1'
   elif dotnet_major_version == 2
@@ -232,6 +252,13 @@ if (get_option('dotnet'))
     lib_csproj_conf_data.set('EFL_BETA', '')
   endif
 
+  if target_machine.system() == 'windows'
+    lib_csproj_conf_data.set('EFL_WIN32', 'WIN32')
+  else
+    lib_csproj_conf_data.set('EFL_WIN32', '')
+  endif
+
+
   lib_csproj = configure_file(input: 'efl_sharp.csproj.in',
                               output: 'efl_sharp.csproj',
                               configuration: lib_csproj_conf_data)

src/examples/ecore/ecore_audio_custom.c

@@ -1,6 +1,8 @@
 // Compile with:
 // gcc -o ecore_audio_custom ecore_audio_custom.c `pkg-config --libs --cflags ecore ecore-audio`
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>

src/examples/ecore/ecore_audio_playback.c

@@ -1,6 +1,8 @@
 // Compile with:
 // gcc -o ecore_audio_playback ecore_audio_playback.c `pkg-config --libs --cflags ecore eina ecore-audio`
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
 
 #include <stdio.h>
 #include <string.h>

src/examples/ecore/ecore_audio_to_ogg.c

@@ -1,6 +1,8 @@
 // Compile with:
 // gcc -o ecore_audio_to_ogg ecore_audio_to_ogg.c `pkg-config --libs --cflags ecore eina ecore-audio`
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
 
 #include <stdio.h>
 #include <libgen.h>

src/examples/edje/en_IN/domain_name.po

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: UTF-8\n"
+
 msgid "LOADING"
 msgstr "Loading..."
 

src/examples/edje/hi_IN/domain_name.po

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: UTF-8\n"
+
 msgid "LOADING"
 msgstr "लोड हो रहा है..."
 

src/lib/ecore/ecore_exe.c

@@ -33,6 +33,14 @@ struct _ecore_exe_dead_exe
    char *cmd;
 };
 
+#ifdef _WIN32
+/*
+ * this job is used to close child processes when parent one is closed
+ * see https://stackoverflow.com/a/53214/688348
+ */
+HANDLE _ecore_exe_win32_job = NULL;
+#endif
+
 EAPI int ECORE_EXE_EVENT_ADD = 0;
 EAPI int ECORE_EXE_EVENT_DEL = 0;
 EAPI int ECORE_EXE_EVENT_DATA = 0;
@@ -338,6 +346,21 @@ ecore_exe_hup(Ecore_Exe *obj)
 void
 _ecore_exe_init(void)
 {
+#ifdef _WIN32
+   _ecore_exe_win32_job = CreateJobObject( NULL, NULL);
+   if (_ecore_exe_win32_job)
+     {
+        JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli;
+
+        memset (&jeli, 0, sizeof(jeli));
+        jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+        if (!SetInformationJobObject(_ecore_exe_win32_job, JobObjectExtendedLimitInformation, &jeli, sizeof(jeli)))
+          {
+             CloseHandle(_ecore_exe_win32_job);
+             _ecore_exe_win32_job = NULL;
+          }
+     }
+#endif
    ECORE_EXE_EVENT_ADD = ecore_event_type_new();
    ECORE_EXE_EVENT_DEL = ecore_event_type_new();
    ECORE_EXE_EVENT_DATA = ecore_event_type_new();
@@ -358,6 +381,11 @@ _ecore_exe_shutdown(void)
                           ECORE_EXE_EVENT_DEL,
                           ECORE_EXE_EVENT_DATA,
                           ECORE_EXE_EVENT_ERROR);
+
+#ifdef _WIN32
+   if (_ecore_exe_win32_job)
+     CloseHandle(_ecore_exe_win32_job);
+#endif
 }
 
 Ecore_Exe *

src/lib/ecore/ecore_exe_private.h

@@ -133,6 +133,10 @@ struct _Ecore_Exe_Data
 
 typedef struct _Ecore_Exe_Data Ecore_Exe_Data;
 
+#ifdef _WIN32
+extern HANDLE _ecore_exe_win32_job;
+#endif
+
 EAPI extern int ECORE_EXE_EVENT_ADD;
 EAPI extern int ECORE_EXE_EVENT_DEL;
 EAPI extern int ECORE_EXE_EVENT_DATA;

src/lib/ecore/ecore_exe_win32.c

@@ -512,6 +512,13 @@ _impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
         goto error;
      }
 
+   if ((flags & ECORE_EXE_TERM_WITH_PARENT) && _ecore_exe_win32_job)
+     {
+        if (!AssignProcessToJobObject(_ecore_exe_win32_job, pi.hProcess))
+          WRN("AssignProcessToJobObject failed (job: %p, process: %p",
+              _ecore_exe_win32_job, pi.hProcess);
+     }
+
    /*
     * Close pipe handles (do not continue to modify the parent).
     * We need to make sure that no handles to the write end of the

src/lib/ecore/ecore_main.c

@@ -447,7 +447,11 @@ _ecore_main_fdh_poll_add(Efl_Loop_Data *pd EINA_UNUSED, Ecore_Fd_Handler *fdh)
         fdh->gfd.events = _gfd_events_from_fdh(fdh);
         fdh->gfd.revents = 0;
         DBG("adding gpoll on %d %08x", fdh->fd, fdh->gfd.events);
-        g_source_add_poll(ecore_glib_source, &fdh->gfd);
+        if (ecore_glib_source)
+           g_source_add_poll(ecore_glib_source, &fdh->gfd);
+        else
+           ERR("Failed to add gpoll on %d %08x. GSource is NULL",
+                           fdh->fd, fdh->gfd.events); 
 #endif
      }
    return r;
@@ -939,29 +943,6 @@ quit:
 static void
 _ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
 {
-   // Please note that this function is being also called in case of a bad
-   // fd to reset the main loop.
-#ifdef HAVE_SYS_EPOLL_H
-   pd->epoll_fd = epoll_create(1);
-   if (pd->epoll_fd < 0) WRN("Failed to create epoll fd!");
-   else
-     {
-        eina_file_close_on_exec(pd->epoll_fd, EINA_TRUE);
-
-        pd->epoll_pid = getpid();
-
-        // add polls on all our file descriptors
-        Ecore_Fd_Handler *fdh;
-        EINA_INLIST_FOREACH(pd->fd_handlers, fdh)
-          {
-             if (fdh->delete_me) continue;
-             _ecore_epoll_add(pd->epoll_fd, fdh->fd,
-                              _ecore_poll_events_from_fdh(fdh), fdh);
-             _ecore_main_fdh_poll_add(pd, fdh);
-          }
-     }
-#endif
-
    if (obj == ML_OBJ)
      {
 #ifdef HAVE_LIBUV
@@ -1072,6 +1053,30 @@ _ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
           }
 #endif
      }
+
+   // Please note that this function is being also called in case of a bad
+   // fd to reset the main loop.
+#ifdef HAVE_SYS_EPOLL_H
+   pd->epoll_fd = epoll_create(1);
+   if (pd->epoll_fd < 0) WRN("Failed to create epoll fd!");
+   else
+     {
+        eina_file_close_on_exec(pd->epoll_fd, EINA_TRUE);
+
+        pd->epoll_pid = getpid();
+
+        // add polls on all our file descriptors
+        Ecore_Fd_Handler *fdh;
+        EINA_INLIST_FOREACH(pd->fd_handlers, fdh)
+          {
+             if (fdh->delete_me) continue;
+             _ecore_epoll_add(pd->epoll_fd, fdh->fd,
+                              _ecore_poll_events_from_fdh(fdh), fdh);
+             _ecore_main_fdh_poll_add(pd, fdh);
+          }
+     }
+#endif
+
    _ecore_main_timechanges_start(obj);
 }
 

src/lib/ecore_drm2/ecore_drm2_plane.c

@@ -43,7 +43,7 @@ ecore_drm2_plane_assign(Ecore_Drm2_Output *output, Ecore_Drm2_Fb *fb, int x, int
 {
    Eina_List *l;
    Ecore_Drm2_Plane *plane;
-   Ecore_Drm2_Plane_State *pstate;
+   Ecore_Drm2_Plane_State *pstate, *pstate_chosen = NULL;
 
    if (!_ecore_drm2_use_atomic) return NULL;
 
@@ -68,12 +68,12 @@ ecore_drm2_plane_assign(Ecore_Drm2_Output *output, Ecore_Drm2_Fb *fb, int x, int
                continue;
 
              /* if we reach here, this FB can go on the cursor plane */
-             goto out;
+             pstate_chosen = pstate;
           }
         else if (pstate->type.value == DRM_PLANE_TYPE_OVERLAY)
           {
              /* there are no size checks for an overlay plane */
-             goto out;
+             pstate_chosen = pstate;
           }
         else if (pstate->type.value == DRM_PLANE_TYPE_PRIMARY)
           {
@@ -82,10 +82,15 @@ ecore_drm2_plane_assign(Ecore_Drm2_Output *output, Ecore_Drm2_Fb *fb, int x, int
                continue;
 
              /* if we reach here, this FB can go on the primary plane */
-             goto out;
+             pstate_chosen = pstate;
           }
      }
 
+   if (pstate_chosen)
+     {
+        pstate = pstate_chosen;
+        goto out;
+     }
    return NULL;
 
 out:

src/lib/ecore_evas/ecore_evas_module.c

@@ -22,15 +22,6 @@ static Eina_Module *_ecore_evas_vnc = NULL;
 # define ECORE_EVAS_ENGINE_NAME "module.so"
 #endif
 
-static inline Eina_Bool
-_file_exists(const char *file)
-{
-   if (!file) return EINA_FALSE;
-
-   if (access(file, F_OK) == -1) return EINA_FALSE;
-   return EINA_TRUE;
-}
-
 
 static Eina_Module *
 _ecore_evas_vnc_server_module_try_load(const char *prefix,
@@ -219,7 +210,7 @@ _ecore_evas_available_engines_get(void)
              eina_strbuf_append_printf(buf, "%s/%s/" ECORE_EVAS_ENGINE_NAME,
                                        info->path, MODULE_ARCH);
 
-             if (_file_exists(eina_strbuf_string_get(buf)))
+             if (eina_file_access(eina_strbuf_string_get(buf), EINA_FILE_ACCESS_MODE_EXIST))
                {
                   const char *name;
 

src/lib/ecore_file/ecore_file.c

@@ -606,111 +606,19 @@ ecore_file_dir_get(const char *file)
 EAPI Eina_Bool
 ecore_file_can_read(const char *file)
 {
-   if (!file) return EINA_FALSE;
-   if (!access(file, R_OK)) return EINA_TRUE;
-   return EINA_FALSE;
+   return eina_file_access(file, EINA_FILE_ACCESS_MODE_READ);
 }
 
 EAPI Eina_Bool
 ecore_file_can_write(const char *file)
 {
-   if (!file) return EINA_FALSE;
-   if (!access(file, W_OK)) return EINA_TRUE;
-   return EINA_FALSE;
+   return eina_file_access(file, EINA_FILE_ACCESS_MODE_WRITE);
 }
 
 EAPI Eina_Bool
 ecore_file_can_exec(const char *file)
 {
-#ifdef _WIN32
-   HANDLE h;
-   HANDLE fm;
-   char *base;
-   char *base_nt;
-   LARGE_INTEGER sz;
-   WORD characteristics;
-#endif
-
-   if (!file || !*file) return EINA_FALSE;
-
-#ifdef _WIN32
-   /*
-    * we parse the file to check if it is a PE file (EXE or DLL)
-    * and we finally check whether it's a DLL or not.
-    * Reference :
-    * https://docs.microsoft.com/en-us/windows/win32/debug/pe-format
-    */
-   h = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, NULL,
-                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-   if (h == INVALID_HANDLE_VALUE)
-     goto test_bat;
-
-   if (!GetFileSizeEx(h, &sz))
-     goto close_h;
-
-   /* a PE file must have at least the DOS and NT headers */
-   if (sz.QuadPart < (LONGLONG)(sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS)))
-     goto close_h;
-
-   fm = CreateFileMapping(h, NULL, PAGE_READONLY, 0, 0, NULL);
-   if (fm == NULL)
-     goto close_h;
-
-   base = (char *)MapViewOfFile(fm, FILE_MAP_READ, 0, 0, 0);
-   CloseHandle(fm);
-   if (base == NULL)
-     goto close_h;
-
-   /*
-    * the PE file begins with the DOS header.
-    * First magic number : the DOS header must begin with a DOS magic number,
-    * that is "MZ", that is 0x5a4d, stored in a WORD.
-    */
-   if (*((WORD *)base) != 0x5a4d)
-     goto unmap_view;
-
-   /*
-    * The position of the NT header is located at the offset 0x3c.
-    */
-   base_nt = base + *((DWORD *)(base + 0x3c));
-   /*
-    * The NT header begins with the magic number "PE\0\0", that is
-    * 0x00004550, stored in a DWORD.
-    */
-   if (*((DWORD *)base_nt) != 0x00004550)
-     goto unmap_view;
-
-   /*
-    * to get informations about executable (EXE or DLL), we look at
-    * the 'Characteristics' member of the NT header, located at the offset
-    * 22 (4 for the magic number, 18 for the offset) from base_nt.
-    * https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#characteristics
-    */
-   characteristics = *((WORD *)(base_nt + 4 + 18));
-
-   UnmapViewOfFile(base);
-   CloseHandle(h);
-
-   /*
-    * 0x0002 : if set, EXE or DLL
-    * 0x2000 : if set, DLL
-    */
-   if ((characteristics & 0x0002) && !(characteristics & 0x2000))
-     return EINA_TRUE;
- unmap_view:
-   UnmapViewOfFile(base);
- close_h:
-   CloseHandle(h);
- test_bat:
-   /*
-    * a .bat file, considered as an executable, is only a text file,
-    * so we rely on the extension. Not the best but we cannot do more.
-    */
-   return eina_str_has_extension(file, ".bat");
-#else
-   if (!access(file, X_OK)) return EINA_TRUE;
-#endif
-   return EINA_FALSE;
+   return eina_file_access(file, EINA_FILE_ACCESS_MODE_EXEC);
 }
 
 EAPI char *

src/lib/ecore_x/ecore_x_fixes.c

@@ -467,7 +467,7 @@ ecore_x_root_screen_barriers_set(Ecore_X_Rectangle *screens, int num)
    Region reg, reg2, reg3;
    Window rwin, cwin;
    int rx, ry, wx, wy;
-   int i, j;
+   int i;
    int closest_dist, dist;
    int sx, sy, dx, dy;
    unsigned int mask;
@@ -537,50 +537,48 @@ ecore_x_root_screen_barriers_set(Ecore_X_Rectangle *screens, int num)
    bar_alloc = 0;
    if ((!screens) || (num <= 0)) return;
 
-   // set up new ones given the screen list given
+   // new region
+   reg = XCreateRegion();
+   // add each screen rect + 1 pixel around it to reg
    for (i = 0; i < num; i++)
      {
         XRectangle xrect;
 
-        reg = XCreateRegion();
         reg2 = XCreateRegion();
-        xrect.x = screens[i].x - 1;
-        xrect.y = screens[i].y - 1;
-        xrect.width = screens[i].width + 2;
+        xrect.x      = screens[i].x - 1;
+        xrect.y      = screens[i].y - 1;
+        xrect.width  = screens[i].width + 2;
         xrect.height = screens[i].height + 2;
         XUnionRectWithRegion(&xrect, reg, reg2);
         XDestroyRegion(reg);
         reg = reg2;
+     }
+   // del the content of each screen from the above
+   for (i = 0; i < num; i++)
+     {
+        XRectangle xrect;
 
-        // reg == screen i + 1 pixel surrounding it
-        for (j = 0; j < num; j++)
-          {
-             // create a region representing screen j
-             reg2 = XCreateRegion();
-             reg3 = XCreateRegion();
-             xrect.x = screens[j].x;
-             xrect.y = screens[j].y;
-             xrect.width = screens[j].width;
-             xrect.height = screens[j].height;
-             XUnionRectWithRegion(&xrect, reg2, reg3);
-             XDestroyRegion(reg2);
-             reg2 = reg3;
-             // reg2 == screen j
-
-             reg3 = XCreateRegion();
-             XSubtractRegion(reg, reg2, reg3);
-             XDestroyRegion(reg);
-             XDestroyRegion(reg2);
-             reg = reg3;
-             // reg now has had screen j cut out of the boundary
-          }
-        // reg is the result of starting with screen i and then with a
-        // 1 pixel boundary around it havnig adjacent screens "cut out"
-        // of that boundary leaving only extra bounds where no screens
-        // are adjacent
+        // create just a rect with the screen in it
+        reg2 = XCreateRegion();
+        reg3 = XCreateRegion();
+        xrect.x      = screens[i].x;
+        xrect.y      = screens[i].y;
+        xrect.width  = screens[i].width;
+        xrect.height = screens[i].height;
+        XUnionRectWithRegion(&xrect, reg3, reg2);
+        XDestroyRegion(reg3);
 
+        // now subtract it
+        reg3 = XCreateRegion();
+        XSubtractRegion(reg, reg2, reg3);
+        XDestroyRegion(reg);
+        XDestroyRegion(reg2);
+        reg = reg3;
+     }
+   if (reg)
+     {
         // walk rects and create barriers
-        for (j = 0; j < reg->numRects; j++)
+        for (i = 0; i < reg->numRects; i++)
           {
              int x1, y1, x2, y2;
 
@@ -592,14 +590,15 @@ ecore_x_root_screen_barriers_set(Ecore_X_Rectangle *screens, int num)
                   if (!t)
                     {
                        bar_num--;
+                       XDestroyRegion(reg);
                        return;
                     }
                   bar = t;
                }
-             x1 = reg->rects[j].x1;
-             y1 = reg->rects[j].y1;
-             x2 = reg->rects[j].x2 - 1;
-             y2 = reg->rects[j].y2 - 1;
+             x1 = reg->rects[i].x1;
+             y1 = reg->rects[i].y1;
+             x2 = reg->rects[i].x2 - 1;
+             y2 = reg->rects[i].y2 - 1;
              bar[bar_num - 1] =
                XFixesCreatePointerBarrier(_ecore_x_disp,
                                           DefaultRootWindow(_ecore_x_disp),

src/lib/eet/eet_dictionary.c

@@ -31,11 +31,14 @@ eet_dictionary_free(Eet_Dictionary *ed)
    if (!ed) return;
    eina_rwlock_free(&ed->rwlock);
 
-   for (i = 0; i < ed->count; i++)
+   if ((ed->all_allocated) && (ed->all))
      {
-        if (ed->all_allocated[i >> 3] & (1 << (i & 0x7)))
+        for (i = 0; i < ed->count; i++)
           {
-             eina_stringshare_del(ed->all[i].str);
+             if (ed->all_allocated[i >> 3] & (1 << (i & 0x7)))
+               {
+                  eina_stringshare_del(ed->all[i].str);
+               }
           }
      }
    free(ed->all);

src/lib/eet/eet_lib.c

@@ -1527,7 +1527,7 @@ eet_open(const char   *file,
 {
    Eina_File *fp;
    Eet_File *ef;
-   int file_len;
+   int file_len, ret;
    unsigned long int size;
 
    if (!file)
@@ -1566,6 +1566,12 @@ eet_open(const char   *file,
    /* try open the file based on mode */
    if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_READ_WRITE))
      {
+        if (mode == EET_FILE_MODE_READ_WRITE)
+          {
+             /* do not use eina_file_access() here */
+             ret = access(file, W_OK);
+             if ((ret != 0) && (errno != ENOENT)) return NULL;
+          }
         /* Prevent garbage in futur comparison. */
          fp = eina_file_open(file, EINA_FALSE);
          if (!fp)
@@ -1601,6 +1607,9 @@ open_error:
         size = 0;
 
         fp = NULL;
+        /* do not use eina_file_access() here */
+        ret = access(file, W_OK);
+        if ((ret != 0) && (errno != ENOENT)) return NULL;
      }
 
    /* We found one */

src/lib/eeze/eeze_disk.c

@@ -460,23 +460,23 @@ eeze_disk_removable_get(Eeze_Disk *disk)
 EAPI Eina_Bool
 eeze_disk_can_mount(void)
 {
-   if (sizeof(EEZE_MOUNT_BIN) == sizeof(""))
-     return EINA_FALSE;
-   return access(EEZE_MOUNT_BIN, X_OK | R_OK) == 0;
+   return eina_file_access(EEZE_MOUNT_BIN,
+                           EINA_FILE_ACCESS_MODE_EXEC |
+                           EINA_FILE_ACCESS_MODE_READ);
 }
 
 EAPI Eina_Bool
 eeze_disk_can_unmount(void)
 {
-   if (sizeof(EEZE_UNMOUNT_BIN) == sizeof(""))
-     return EINA_FALSE;
-   return access(EEZE_UNMOUNT_BIN, X_OK | R_OK) == 0;
+   return eina_file_access(EEZE_UNMOUNT_BIN,
+                           EINA_FILE_ACCESS_MODE_EXEC |
+                           EINA_FILE_ACCESS_MODE_READ);
 }
 
 EAPI Eina_Bool
 eeze_disk_can_eject(void)
 {
-   if (sizeof(EEZE_EJECT_BIN) == sizeof(""))
-     return EINA_FALSE;
-   return access(EEZE_EJECT_BIN, X_OK | R_OK) == 0;
+   return eina_file_access(EEZE_EJECT_BIN,
+                           EINA_FILE_ACCESS_MODE_EXEC |
+                           EINA_FILE_ACCESS_MODE_READ);
 }

src/lib/eeze/eeze_disk_libmount.c

@@ -56,7 +56,7 @@ static Eina_Bool
 _eeze_mount_lock_mtab(void)
 {
 //    DBG("Locking mlock: %s", mnt_lock_get_linkfile(_eeze_mtab_lock));
-    if (EINA_LIKELY(access("/etc/mtab", W_OK)))
+    if (EINA_LIKELY(!eina_file_access("/etc/mtab", EINA_FILE_ACCESS_MODE_WRITE)))
       {
          INF("Insufficient privs for mtab lock, continuing without lock");
          return EINA_TRUE;

src/lib/efl_mono/efl_custom_exports_mono.c

@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#ifdef _WIN32
+# include "evil_private.h" /* setenv */
+#endif
+
 #include "Eo.h"
 #include "Eina.h"
 #include "Ecore.h"

src/lib/efreet/efreet_cache.c

@@ -545,91 +545,6 @@ efreet_desktop_util_cache_file(void)
 /*
  * Needs EAPI because of helper binaries
  */
-#define SHSH(n, v) ((((v) << (n)) & 0xffffffff) | ((v) >> (32 - (n))))
-
-static inline int
-int_to_bigendian(int in)
-{
-   static const unsigned char test[4] = { 0x11, 0x22, 0x33, 0x44 };
-   static const unsigned int *test_i = (const unsigned int *)test;
-   if (test_i[0] == 0x44332211) return eina_swap32(in);
-   return in;
-}
-
-static void
-sha1(unsigned char *data, int size, unsigned char *dst)
-{
-   unsigned int digest[5], word[80], wa, wb, wc, wd, we, t;
-   unsigned char buf[64], *d;
-   int idx, left, i;
-   const unsigned int magic[4] =
-     { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
-
-   idx = 0;
-   digest[0] = 0x67452301; digest[1] = 0xefcdab89; digest[2] = 0x98badcfe;
-   digest[3] = 0x10325476; digest[4] = 0xc3d2e1f0;
-
-   memset(buf, 0, sizeof(buf));
-   for (left = size, d = data; left > 0; left--, d++)
-     {
-        if ((idx == 0) && (left < 64))
-          {
-             memset(buf, 0, 60);
-             buf[60] = (size >> 24) & 0xff;
-             buf[61] = (size >> 16) & 0xff;
-             buf[62] = (size >> 8) & 0xff;
-             buf[63] = (size) & 0xff;
-          }
-        buf[idx] = *d;
-        idx++;
-        if ((idx == 64) || (left == 1))
-          {
-             if ((left == 1) && (idx < 64)) buf[idx] = 0x80;
-             for (i = 0; i < 16; i++)
-               {
-                  word[i]  = (unsigned int)buf[(i * 4)    ] << 24;
-                  word[i] |= (unsigned int)buf[(i * 4) + 1] << 16;
-                  word[i] |= (unsigned int)buf[(i * 4) + 2] << 8;
-                  word[i] |= (unsigned int)buf[(i * 4) + 3];
-               }
-             for (i = 16; i < 80; i++)
-               word[i] = SHSH(1,
-                              word[i - 3 ] ^ word[i - 8 ] ^
-                              word[i - 14] ^ word[i - 16]);
-             wa = digest[0]; wb = digest[1]; wc = digest[2];
-             wd = digest[3]; we = digest[4];
-             for (i = 0; i < 80; i++)
-               {
-                  if (i < 20)
-                    t = SHSH(5, wa) + ((wb & wc) | ((~wb) & wd)) +
-                        we + word[i] + magic[0];
-                  else if (i < 40)
-                    t = SHSH(5, wa) + (wb ^ wc ^ wd) +
-                        we + word[i] + magic[1];
-                  else if (i < 60)
-                    t = SHSH(5, wa) + ((wb & wc) | (wb & wd) | (wc & wd)) +
-                        we + word[i] + magic[2];
-                  else if (i < 80)
-                    t = SHSH(5, wa) + (wb ^ wc ^ wd) +
-                        we + word[i] + magic[3];
-                  we = wd;
-                  wd = wc;
-                  wc = SHSH(30, wb);
-                  wb = wa;
-                  wa = t;
-               }
-             digest[0] += wa; digest[1] += wb; digest[2] += wc;
-             digest[3] += wd; digest[4] += we;
-             idx = 0;
-          }
-     }
-   t = int_to_bigendian(digest[0]); digest[0] = t;
-   t = int_to_bigendian(digest[1]); digest[1] = t;
-   t = int_to_bigendian(digest[2]); digest[2] = t;
-   t = int_to_bigendian(digest[3]); digest[3] = t;
-   t = int_to_bigendian(digest[4]); digest[4] = t;
-   memcpy(dst, digest, 5 * 4);
-}
 
 EAPI Eina_Bool
 efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check)
@@ -651,7 +566,7 @@ efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check)
         if ((size > 0) && ((size_t)size >= sizeof(link))) return EINA_FALSE;
         if (stat(file, &st) != 0) return EINA_FALSE;
      }
-   if (size > 0) sha1((unsigned char *)link, size, check->link_sha1);
+   if (size > 0) eina_sha1((const unsigned char *)link, size, check->link_sha1);
 #endif
    check->uid    = st.st_uid;
    check->gid    = st.st_gid;

src/lib/efreet/efreet_desktop_command.c

@@ -833,7 +833,7 @@ efreet_desktop_command_path_absolute(const char *path)
     int len = 0;
 
     /* relative url */
-    if (path[0] != '/')
+    if (eina_file_path_relative(path))
     {
         if (!(buf = malloc(size))) return NULL;
         if (!getcwd(buf, size))

src/lib/efreet/efreet_menu.c

@@ -3125,7 +3125,7 @@ efreet_menu_path_get(Efreet_Menu_Internal *internal, const char *suffix)
     size_t len;
 
     /* see if we've got an absolute or relative path */
-    if (suffix[0] == '/')
+    if (!eina_file_path_relative(suffix))
         snprintf(path, sizeof(path), "%s", suffix);
 
     else

src/lib/eina/Eina.h

@@ -277,6 +277,7 @@ extern "C" {
 #include <eina_promise.h>
 #include <eina_vpath.h>
 #include <eina_abstract_content.h>
+#include <eina_sha.h>
 
 
 #ifdef __cplusplus

src/lib/eina/eina_debug_bt.c

@@ -293,12 +293,14 @@ _signal_shutdown(void)
 }
 
 static void
-_collect_bt(pthread_t pth)
+_collect_bt(Eina_Thread th)
 {
    // this async signals the thread to switch to the deebug signal handler
    // and collect a backtrace and other info from inside the thread
 #ifndef _WIN32
-   pthread_kill(pth, SIG);
+   pthread_kill((pthread_t)th, SIG); // we can cast Eina_Thread -> pthread_t
+#else
+   (th); // silenmce unused warn
 #endif
 }
 

src/lib/eina/eina_file.h

@@ -148,6 +148,21 @@ typedef enum {
   EINA_FILE_REMOVE      /**< This memory is to be released and any content will be lost. Subsequent accesses will succeed but return fresh memory as if accessed for the first time. This may not succeed if the filesystem does not support it. @since 1.8 */
 } Eina_File_Populate;
 
+/**
+ * @typedef Eina_File_Access_Mode
+ * @brief Type for enumeration of a file access mode.
+ * @details This type is used with eina_file_access(). Enumerations can be
+ * combined bitwise with the OR operator.
+ * @since 1.28
+ */
+typedef enum
+{
+  EINA_FILE_ACCESS_MODE_EXIST = 0,      /**< existence test: F_OK */
+  EINA_FILE_ACCESS_MODE_EXEC = 1 << 0,  /**< exec permission: X_OK */
+  EINA_FILE_ACCESS_MODE_WRITE = 1 << 1, /**< write permission: W_OK */
+  EINA_FILE_ACCESS_MODE_READ = 1 << 2,  /**< read permission: R_OK */
+} Eina_File_Access_Mode;
+
 /* Why do this? Well PATH_MAX may vary from when eina itself is compiled
  * to when the app using eina is compiled. Exposing the path buffer below
  * can't safely and portably vary based on how/when you compile. It should
@@ -245,6 +260,19 @@ struct _Eina_File_Line
  */
 #define EINA_FILE_DIR_LIST_CB(function) ((Eina_File_Dir_List_Cb)function)
 
+/**
+ * @brief Determines if a path is relative or absolute.
+ *
+ * @param[in] path The path to check.
+ *
+ * @return #EINA_TRUE if the path is relative, #EINA_FALSE otherwise.
+ *
+ * The implementation simply checks if the first char in the path is
+ * '/' on POSIX systems. On Windows, absolute paths begin with '\' or
+ * 'C:\' (or other letter). If it is not, the path is considered relative.
+ * If @p path is @c NULL, this function returns #EINA_FALSE.
+ */
+EINA_API Eina_Bool eina_file_path_relative(const char *path);
 
 /**
  * @brief Lists all the files on the directory by calling the function for every file found.
@@ -817,6 +845,30 @@ EINA_API void         eina_file_statgen_enable(void);
  */
 EINA_API void         eina_file_statgen_disable(void);
 
+/**
+ * @brief Determine the accessibility of a file or path.
+ *
+ * @param[in] path The path to check.
+ * @param[in] mode Access permissions to be checked, or existence test.
+ * @return #EINA_TRUE it @p path satisfies the tests, #EINA_FALSE otherwise.
+ *
+ * On Linux, this function just calls the access() function. On Windows, it
+ * mimics as best as possible the behavior of access():
+ * - Existence is always checked.
+ * - As on Windows, a file is either read only or read/write, read permission
+ *   is equivalent to existence. so Write permission is equivalent to not
+ *   being read only.
+ * - A directory is always executable, except if greater privilege is needed.
+ *
+ * The @p mode has the same values than F_OK, X_OK, W_OK and R_OK, and the
+ * usage is the same than the access() function.
+ *
+ * If @p path is NULL or the epty string, this function returns #EINA_FALSE.
+ *
+ * @since 1.28
+ */
+EINA_API Eina_Bool    eina_file_access(const char *path, Eina_File_Access_Mode mode);
+
 /**
  * @}
  */

src/lib/eina/eina_file_common.h

@@ -178,18 +178,6 @@ struct _Eina_Lines_Iterator
 /** Macro for logging Eina debug messages */
 #define DBG(...) EINA_LOG_DOM_DBG(_eina_file_log_dom, __VA_ARGS__)
 
-/**
- * @brief Determines if a path is relative or absolute.
- * The implementation simply checks if the first char in the path is '/'.  If it
- * is not, the path is considered relative.
- *
- * @param[in] path The path to check.
- *
- * @return EINA_TRUE if the path is relative, EINA_FALSE otherwise.
- *
- */
-Eina_Bool eina_file_path_relative(const char *path);
-
 /**
  * @brief Gets the current directory and optionally appends a path to it.
  * If a string was passed in via the @p path parameter, it will

src/lib/eina/eina_file_posix.c

@@ -412,7 +412,7 @@ _eina_file_timestamp_compare(Eina_File *f, struct stat *st)
    if (f->length != (unsigned long long) st->st_size) return EINA_FALSE;
    if (f->inode != st->st_ino) return EINA_FALSE;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
+# ifdef st_mtime
    if (f->mtime_nsec != (unsigned long int)st->st_mtim.tv_nsec)
      return EINA_FALSE;
 # else
@@ -521,13 +521,6 @@ eina_file_mmap_faulty(void *addr, long page_size)
  *   Simplified logic for portability layer with eina_file_common   *
  * ================================================================ */
 
-Eina_Bool
-eina_file_path_relative(const char *path)
-{
-   if (*path != '/') return EINA_TRUE;
-   return EINA_FALSE;
-}
-
 Eina_Tmpstr *
 eina_file_current_directory_get(const char *path, size_t len)
 {
@@ -562,6 +555,15 @@ eina_file_cleanup(Eina_Tmpstr *path)
 
 
 
+EINA_API Eina_Bool
+eina_file_path_relative(const char *path)
+{
+   if (!path)
+     return EINA_FALSE;
+
+   return *path != '/';
+}
+
 EINA_API Eina_Bool
 eina_file_dir_list(const char *dir,
                    Eina_Bool recursive,
@@ -868,11 +870,7 @@ eina_file_open(const char *path, Eina_Bool shared)
         n->length = file_stat.st_size;
         n->mtime = file_stat.st_mtime;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
         n->mtime_nsec = (unsigned long int)file_stat.st_mtim.tv_nsec;
-# else
-        n->mtime_nsec = (unsigned long int)file_stat.st_mtimensec;
-# endif
 #endif
         n->inode = file_stat.st_ino;
         n->fd = fd;
@@ -926,11 +924,7 @@ eina_file_refresh(Eina_File *file)
    file->length = file_stat.st_size;
    file->mtime = file_stat.st_mtime;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
    file->mtime_nsec = (unsigned long int)file_stat.st_mtim.tv_nsec;
-# else
-   file->mtime_nsec = (unsigned long int)file_stat.st_mtimensec;
-# endif
 #endif
    file->inode = file_stat.st_ino;
 
@@ -1243,15 +1237,9 @@ eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Stat *st)
    st->mtime = buf.st_mtime;
    st->ctime = buf.st_ctime;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
    st->atimensec = buf.st_atim.tv_nsec;
    st->mtimensec = buf.st_mtim.tv_nsec;
    st->ctimensec = buf.st_ctim.tv_nsec;
-# else
-   st->atimensec = buf.st_atimensec;
-   st->mtimensec = buf.st_mtimensec;
-   st->ctimensec = buf.st_ctimensec;
-# endif
 #else
    st->atimensec = 0;
    st->mtimensec = 0;
@@ -1585,3 +1573,13 @@ eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path)
    if (path) *path = eina_tmpstr_add(tmpdirname);
    return EINA_TRUE;
 }
+
+
+EINA_API Eina_Bool
+eina_file_access(const char *path, Eina_File_Access_Mode mode)
+{
+   if (!path || !*path)
+     return EINA_FALSE;
+
+   return access(path, mode) == 0;
+}

src/lib/eina/eina_file_win32.c

@@ -515,12 +515,6 @@ _eina_file_mkdtemp(char *__template)
  *   Simplified logic for portability layer with eina_file_common   *
  * ================================================================ */
 
-Eina_Bool
-eina_file_path_relative(const char *path)
-{
-   return !evil_path_is_absolute(path);
-}
-
 Eina_Tmpstr *
 eina_file_current_directory_get(const char *path, size_t len)
 {
@@ -559,6 +553,29 @@ eina_file_cleanup(Eina_Tmpstr *path)
  *                                   API                                      *
  *============================================================================*/
 
+EINA_API Eina_Bool
+eina_file_path_relative(const char *path)
+{
+   /* see
+    * https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file#paths
+    * absolute path if:
+    * - is an UNC path (begins with \\)
+    * - has a drive letter (C:\). \ is important here, otherwise it is relative
+    * - begins with \
+    */
+
+   if (!path || *path == '\\')
+     return EINA_FALSE;
+
+   if ((((*path >= 'a') && (*path <= 'z')) ||
+        ((*path >= 'A') && (*path <= 'Z'))) &&
+       (path[1] == ':') &&
+       ((path[2] == '\\') || (path[2] == '/')))
+     return EINA_FALSE;
+
+   return EINA_TRUE;
+}
+
 EINA_API Eina_Bool
 eina_file_dir_list(const char *dir,
                    Eina_Bool recursive,
@@ -1269,3 +1286,48 @@ eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path)
    if (path) *path = eina_tmpstr_add(tmpdirname);
    return EINA_TRUE;
 }
+
+EINA_API Eina_Bool
+eina_file_access(const char *path, Eina_File_Access_Mode mode)
+{
+   DWORD attr;
+
+   if (!path || !*path)
+     return EINA_FALSE;
+
+   if ((mode != EINA_FILE_ACCESS_MODE_EXIST) &&
+       ((mode >> 3) != 0))
+     return EINA_FALSE;
+
+   /*
+    * Always check for existence for both files and directories
+   */
+   attr = GetFileAttributes(path);
+   if (attr == INVALID_FILE_ATTRIBUTES)
+     return EINA_FALSE;
+
+   /*
+    * On Windows a file or path is either read/write or read only.
+    * So if it exists, it has at least read access.
+    * So do something only if mode is EXEC or WRITE
+    */
+
+   if (mode & EINA_FILE_ACCESS_MODE_EXEC)
+     {
+        if (!(attr & FILE_ATTRIBUTE_DIRECTORY) &&
+            !eina_str_has_extension(path, ".exe") &&
+            !eina_str_has_extension(path, ".bat"))
+          return EINA_FALSE;
+     }
+
+   if (mode & EINA_FILE_ACCESS_MODE_WRITE)
+     {
+        if (attr == INVALID_FILE_ATTRIBUTES)
+          return EINA_FALSE;
+
+        if (attr & FILE_ATTRIBUTE_READONLY)
+          return EINA_FALSE;
+     }
+
+   return EINA_TRUE;
+}

src/lib/eina/eina_prefix.c

@@ -43,7 +43,7 @@
 
 #ifdef _WIN32
 # include <direct.h> /* getcwd */
-# include <evil_private.h> /* path_is_absolute realpath dladdr */
+# include <evil_private.h> /* realpath dladdr */
 #endif
 
 #include "eina_config.h"
@@ -166,16 +166,6 @@ _path_sep_fix(char *buf)
 #endif
 }
 
-static Eina_Bool
-_path_absolute_check(const char *path)
-{
-#ifdef _WIN32
-   return evil_path_is_absolute(path);
-#else
-   return (path[0] == EINA_PATH_SEP_C);
-#endif
-}
-
 static int
 _fallback(Eina_Prefix *pfx, const char *pkg_bin, const char *pkg_lib,
           const char *pkg_data, const char *pkg_locale, const char *envprefix)
@@ -284,9 +274,9 @@ _try_argv(Eina_Prefix *pfx, const char *argv0)
    char buf[PATH_MAX], buf2[PATH_MAX];
 
    /* 1. is argv0 abs path? */
-   if (_path_absolute_check(argv0))
+   if (!eina_file_path_relative(argv0))
      {
-        if (access(argv0, X_OK) == 0)
+        if (eina_file_access(argv0, EINA_FILE_ACCESS_MODE_EXEC))
           {
              INF("Executable argv0 is full path = %s", argv0);
              STRDUP_REP(pfx->exe_path, argv0);
@@ -306,7 +296,7 @@ _try_argv(Eina_Prefix *pfx, const char *argv0)
              eina_file_path_join(joined, len, buf2, argv0);
              if (realpath(joined, buf))
                {
-                  if (access(buf, X_OK) == 0)
+                  if (eina_file_access(buf, EINA_FILE_ACCESS_MODE_EXEC))
                     {
                        INF("Executable relative argv0=%s, cwd=%s, realpath=%s",
                            argv0, buf2, buf);
@@ -350,7 +340,7 @@ _try_argv(Eina_Prefix *pfx, const char *argv0)
         strcpy(buf2 + len + 1, argv0);
         if (realpath(buf2, buf))
           {
-             if (access(buf, X_OK) == 0)
+             if (eina_file_access(buf, EINA_FILE_ACCESS_MODE_EXEC))
                {
                   STRDUP_REP(pfx->exe_path, buf);
                   INF("Path %s is executable", pfx->exe_path);
@@ -579,7 +569,7 @@ eina_prefix_new(const char *argv0, void *symbol, const char *envprefix,
           {
              if (info_dl.dli_fname)
                {
-                  if (_path_absolute_check(info_dl.dli_fname))
+                  if (!eina_file_path_relative(info_dl.dli_fname))
                     {
                        INF("dladdr for symbol=%p: %s", symbol, info_dl.dli_fname);
                        char *rlink = realpath(info_dl.dli_fname, NULL);

src/lib/eina/eina_sha.c

@@ -0,0 +1,122 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2023 Carsten Haitzler
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <string.h>
+
+#include "eina_private.h"
+#include "eina_sha.h"
+#include "eina_cpu.h"
+
+/*============================================================================*
+ *                                   API                                      *
+ *============================================================================*/
+
+
+EINA_API void
+eina_sha1(const unsigned char *data, int size, unsigned char dst[20])
+{
+#define SHSH(n, v) ((((v) << (n)) & 0xffffffff) | ((v) >> (32 - (n))))
+   unsigned int digest[5], word[80], wa, wb, wc, wd, we, t;
+   unsigned char buf[64];
+   const unsigned char *d;
+   int idx, left, i;
+   const unsigned int magic[4] =
+   {
+      0x5a827999,
+      0x6ed9eba1,
+      0x8f1bbcdc,
+      0xca62c1d6
+   };
+
+   idx = 0;
+   digest[0] = 0x67452301;
+   digest[1] = 0xefcdab89;
+   digest[2] = 0x98badcfe;
+   digest[3] = 0x10325476;
+   digest[4] = 0xc3d2e1f0;
+
+   memset(buf, 0, sizeof(buf));
+   for (left = size, d = data; left > 0; left--, d++)
+     {
+        if ((idx == 0) && (left < 64))
+          {
+             memset(buf, 0, 60);
+             buf[60] = (size >> 24) & 0xff;
+             buf[61] = (size >> 16) & 0xff;
+             buf[62] = (size >> 8) & 0xff;
+             buf[63] = (size) & 0xff;
+          }
+        buf[idx] = *d;
+        idx++;
+        if ((idx == 64) || (left == 1))
+          {
+             if ((left == 1) && (idx < 64)) buf[idx] = 0x80;
+             for (i = 0; i < 16; i++)
+               {
+                  word[i]  = (unsigned int)buf[(i * 4)    ] << 24;
+                  word[i] |= (unsigned int)buf[(i * 4) + 1] << 16;
+                  word[i] |= (unsigned int)buf[(i * 4) + 2] << 8;
+                  word[i] |= (unsigned int)buf[(i * 4) + 3];
+               }
+             for (i = 16; i < 80; i++)
+               word[i] = SHSH(1,
+                              word[i - 3 ] ^ word[i - 8 ] ^
+                              word[i - 14] ^ word[i - 16]);
+             wa = digest[0];
+             wb = digest[1];
+             wc = digest[2];
+             wd = digest[3];
+             we = digest[4];
+             for (i = 0; i < 80; i++)
+               {
+                  if (i < 20)
+                    t = SHSH(5, wa) + ((wb & wc) | ((~wb) & wd)) + we + word[i] + magic[0];
+                  else if (i < 40)
+                    t = SHSH(5, wa) + (wb ^ wc ^ wd) + we + word[i] + magic[1];
+                  else if (i < 60)
+                    t = SHSH(5, wa) + ((wb & wc) | (wb & wd) | (wc & wd)) + we + word[i] + magic[2];
+                  else if (i < 80)
+                    t = SHSH(5, wa) + (wb ^ wc ^ wd) + we + word[i] + magic[3];
+                  we = wd;
+                  wd = wc;
+                  wc = SHSH(30, wb);
+                  wb = wa;
+                  wa = t;
+               }
+             digest[0] += wa;
+             digest[1] += wb;
+             digest[2] += wc;
+             digest[3] += wd;
+             digest[4] += we;
+             idx = 0;
+          }
+     }
+
+   t = eina_htonl(digest[0]); digest[0] = t;
+   t = eina_htonl(digest[1]); digest[1] = t;
+   t = eina_htonl(digest[2]); digest[2] = t;
+   t = eina_htonl(digest[3]); digest[3] = t;
+   t = eina_htonl(digest[4]); digest[4] = t;
+
+   memcpy(dst, digest, 5 * 4);
+}

src/lib/eina/eina_sha.h

@@ -0,0 +1,38 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2023 Carsten Haitzler
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EINA_SHA_H_
+#define EINA_SHA_H_
+
+/**
+ * @brief Calculate a SHA1 checksum of data
+ *
+ * This function calculates a SHA1 checksum of the binary data pointed to by
+ * @p data of size @p size in bytes and will fill 20 bytes pointed to by
+ * @p dst with the resulting 20 byte binary SHA1 sum.
+ *
+ * The input data should be a valid pointer to at least @p size bytes of data
+ * that will be summed. @p dst should also point to a buffer of at least 20
+ * bytes in size to store the checksum.
+ *
+ * @since 1.27
+ */
+EINA_API void eina_sha1(const unsigned char *data, int size, unsigned char dst[20]) EINA_ARG_NONNULL(1);
+
+
+#endif

src/lib/eina/meson.build

@@ -113,7 +113,8 @@ public_sub_headers = [
 'eina_freeq.h',
 'eina_slstr.h',
 'eina_vpath.h',
-'eina_abstract_content.h'
+'eina_abstract_content.h',
+'eina_sha.h'
 ]
 
 public_headers = [
@@ -197,6 +198,7 @@ eina_src = files([
 'eina_vpath.c',
 'eina_vpath_xdg.c',
 'eina_abstract_content.c',
+'eina_sha.c',
 ]) + eina_mp_sources
 
 if sys_windows == true

src/lib/eio/eio_monitor_poll.c

@@ -110,15 +110,9 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
    est->mtime = st.st_mtime;
    est->ctime = st.st_ctime;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
    est->atimensec = st.st_atim.tv_nsec;
    est->mtimensec = st.st_mtim.tv_nsec;
    est->ctimensec = st.st_ctim.tv_nsec;
-# else
-   est->atimensec = st.st_atimensec;
-   est->mtimensec = st.st_mtimensec;
-   est->ctimensec = st.st_ctimensec;
-# endif
 #else
    est->atimensec = 0;
    est->mtimensec = 0;

src/lib/eio/eio_single.c

@@ -128,15 +128,9 @@ _eio_file_struct_2_eina(Eina_Stat *es, _eio_stat_t *st)
    es->mtime = st->st_mtime;
    es->ctime = st->st_ctime;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
    es->atimensec = st->st_atim.tv_nsec;
    es->mtimensec = st->st_mtim.tv_nsec;
    es->ctimensec = st->st_ctim.tv_nsec;
-# else
-   es->atimensec = st->st_atimensec;
-   es->mtimensec = st->st_mtimensec;
-   es->ctimensec = st->st_ctimensec;
-# endif
 #else
    es->atimensec = 0;
    es->mtimensec = 0;

src/lib/elementary/efl_ui_focus_manager_calc.c

@@ -1526,7 +1526,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_U
           }
         else
           {
-             ERR("Could not fetch a node located at %p", node->focusable);
+             F_DBG("Could not fetch a node located at %p", node->focusable);
              goto end;
           }
      }

src/lib/elementary/efl_ui_image.c

@@ -2164,25 +2164,6 @@ _icon_size_min_get(Evas_Object *image)
    return MAX(16, MIN(w, h));
 }
 
-/* FIXME: move this code to ecore */
-#ifdef _WIN32
-static Eina_Bool
-_path_is_absolute(const char *path)
-{
-   //TODO: Check if this works with all absolute paths in windows
-   return (isalpha(*path)) && (*(path + 1) == ':') &&
-           ((*(path + 2) == '\\') || (*(path + 2) == '/'));
-}
-
-#else
-static Eina_Bool
-_path_is_absolute(const char *path)
-{
-   return *path == '/';
-}
-
-#endif
-
 static Eina_Bool
 _internal_efl_ui_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *fdo)
 {
@@ -2217,7 +2198,7 @@ _internal_efl_ui_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *f
    else
      eina_stringshare_replace(&sd->stdicon, NULL);
 
-   if (_path_is_absolute(name))
+   if (!eina_file_path_relative(name))
      {
         if (fdo)
           *fdo = EINA_FALSE;

src/lib/elementary/efl_ui_image_zoomable.c

@@ -2903,25 +2903,6 @@ _icon_size_min_get(Evas_Object *image)
    return MAX(16, MIN(w, h));
 }
 
-/* FIXME: move this code to ecore */
-#ifdef _WIN32
-static Eina_Bool
-_path_is_absolute(const char *path)
-{
-   //TODO: Check if this works with all absolute paths in windows
-   return (isalpha(*path)) && (*(path + 1) == ':') &&
-           ((*(path + 2) == '\\') || (*(path + 2) == '/'));
-}
-
-#else
-static Eina_Bool
-_path_is_absolute(const char *path)
-{
-   return *path == '/';
-}
-
-#endif
-
 static Eina_Bool
 _internal_efl_ui_image_zoomable_icon_set(Evas_Object *obj, const char *name, Eina_Bool *fdo, Eina_Bool resize)
 {
@@ -2956,7 +2937,7 @@ _internal_efl_ui_image_zoomable_icon_set(Evas_Object *obj, const char *name, Ein
     else
       eina_stringshare_replace(&sd->stdicon, NULL);
 
-   if (_path_is_absolute(name))
+   if (!eina_file_path_relative(name))
      {
         if (fdo)
           *fdo = EINA_FALSE;

src/lib/elementary/efl_ui_slider_interval.c

@@ -329,7 +329,7 @@ _drag_start(void *data,
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
    efl_event_callback_call(data, EFL_UI_SLIDER_INTERVAL_EVENT_SLIDER_DRAG_START, NULL);
-   elm_widget_scroll_freeze_push(data);
+   efl_ui_widget_scroll_freeze_push(data);
 }
 
 static void
@@ -340,7 +340,7 @@ _drag_stop(void *data,
 {
    _slider_update(data, EINA_TRUE);
    efl_event_callback_call(data, EFL_UI_SLIDER_INTERVAL_EVENT_SLIDER_DRAG_STOP, NULL);
-   elm_widget_scroll_freeze_pop(data);
+   efl_ui_widget_scroll_freeze_pop(data);
 }
 
 static void
@@ -413,7 +413,7 @@ _spacer_move_cb(void *data,
           {
              if (!sd->frozen)
                {
-                  elm_widget_scroll_freeze_push(data);
+                  efl_ui_widget_scroll_freeze_push(data);
                   sd->frozen = EINA_TRUE;
                }
              ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
@@ -427,7 +427,7 @@ _spacer_move_cb(void *data,
                (data, EFL_UI_SLIDER_INTERVAL_EVENT_SLIDER_DRAG_STOP, NULL);
              if (sd->frozen)
                {
-                  elm_widget_scroll_freeze_pop(data);
+                  efl_ui_widget_scroll_freeze_pop(data);
                   sd->frozen = EINA_FALSE;
                }
              return;
@@ -466,7 +466,7 @@ _spacer_up_cb(void *data,
 
    if (sd->frozen)
      {
-        elm_widget_scroll_freeze_pop(data);
+        efl_ui_widget_scroll_freeze_pop(data);
         sd->frozen = EINA_FALSE;
      }
 }
@@ -492,7 +492,7 @@ _mouse_out_cb(void *data EINA_UNUSED,
 static char *
 _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
-   const char *txt = elm_widget_access_info_get(obj);
+   const char *txt = efl_ui_widget_access_info_get(obj);
 
    if (!txt) txt = elm_layout_text_get(obj, NULL);
    if (txt) return strdup(txt);
@@ -506,7 +506,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
    char *ret;
    Eina_Strbuf *buf = eina_strbuf_new();
 
-   if (elm_widget_disabled_get(obj))
+   if (efl_ui_widget_disabled_get(obj))
      eina_strbuf_append(buf, " state: disabled");
 
    if (eina_strbuf_length_get(buf))
@@ -713,7 +713,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
 EOLIAN static Eina_Bool
 _efl_ui_slider_interval_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Interval_Data *sd, Efl_Ui_Activate act)
 {
-   if (elm_widget_disabled_get(obj)) return EINA_FALSE;
+   if (efl_ui_widget_disabled_get) return EINA_FALSE;
    if (act == EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
 
    if ((act == EFL_UI_ACTIVATE_UP) ||

src/lib/elementary/efl_ui_win.c

@@ -3563,13 +3563,13 @@ _elm_win_xwin_update(Efl_Ui_Win_Data *sd)
 
         if (image)
           {
-             int w = 0, h = 0, stride, x, y;
+             int w = 0, h = 0, stride = 0, x, y;
              Eina_Bool unmap = EINA_FALSE;
-             Eina_Rw_Slice sl = {};
+             Eina_Rw_Slice sl = { 0 };
 
              if (efl_isa(image, EFL_CANVAS_IMAGE_CLASS))
                {
-                  Eina_Rect rect = {};
+                  Eina_Rect rect = { 0 };
 
                   unmap = EINA_TRUE;
                   rect.size = efl_gfx_buffer_size_get(image);

src/lib/elementary/elm_entry.c

@@ -3556,9 +3556,6 @@ _entry_selection_callbacks_unregister(Evas_Object *obj)
    edje_object_signal_callback_del_full
      (sd->entry_edje, "selection,cleared", "elm.text",
      _entry_selection_cleared_signal_cb, obj);
-   edje_object_signal_callback_del_full
-     (sd->entry_edje, "entry,paste,request,*", "elm.text",
-     _entry_paste_request_signal_cb, obj);
    edje_object_signal_callback_del_full
      (sd->entry_edje, "entry,copy,notify", "elm.text",
      _entry_copy_notify_signal_cb, obj);
@@ -3587,9 +3584,6 @@ _entry_selection_callbacks_register(Evas_Object *obj)
    edje_object_signal_callback_add
      (sd->entry_edje, "selection,cleared", "elm.text",
      _entry_selection_cleared_signal_cb, obj);
-   edje_object_signal_callback_add
-     (sd->entry_edje, "entry,paste,request,*", "elm.text",
-     _entry_paste_request_signal_cb, obj);
    edje_object_signal_callback_add
      (sd->entry_edje, "entry,copy,notify", "elm.text",
      _entry_copy_notify_signal_cb, obj);
@@ -3920,6 +3914,10 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
      (priv->entry_edje, "preedit,changed", "elm.text",
      _entry_preedit_changed_signal_cb, obj);
 
+   edje_object_signal_callback_add
+     (priv->entry_edje, "entry,paste,request,*", "elm.text",
+     _entry_paste_request_signal_cb, obj);
+
    _entry_selection_callbacks_register(obj);
 
    edje_object_signal_callback_add

src/lib/elementary/elm_icon.c

@@ -28,25 +28,6 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
    {NULL, NULL}
 };
 
-/* FIXME: move this code to ecore */
-#ifdef _WIN32
-static Eina_Bool
-_path_is_absolute(const char *path)
-{
-   //TODO: Check if this works with all absolute paths in windows
-   return (isalpha(*path)) && (*(path + 1) == ':') &&
-          ((*(path + 2) == '\\') || (*(path + 2) == '/'));
-}
-
-#else
-static Eina_Bool
-_path_is_absolute(const char *path)
-{
-   return *path == '/';
-}
-
-#endif
-
 static inline int
 _icon_size_min_get(Evas_Object *icon)
 {
@@ -423,27 +404,37 @@ _internal_elm_icon_standard_set(Evas_Object *obj,
                        Eina_Bool *fdo)
 {
    char *tmp;
+   const char *stdtmp;
    Eina_Bool ret = EINA_FALSE;
 
    ELM_ICON_DATA_GET(obj, sd);
 
    /* try locating the icon using the specified theme */
-   if (!strcmp(ELM_CONFIG_ICON_THEME_ELEMENTARY, elm_config_icon_theme_get()))
+   stdtmp = sd->stdicon;
+   sd->stdicon = NULL;
+   ret = _icon_standard_set(obj, name);
+   sd->stdicon = stdtmp;
+   if (ret && fdo) *fdo = EINA_FALSE;
+   if (!ret)
      {
-        ret = _icon_standard_set(obj, name);
-        if (ret && fdo) *fdo = EINA_FALSE;
-
-        if (!ret)
+        /* try locating the icon using the specified theme */
+        if (!strcmp(ELM_CONFIG_ICON_THEME_ELEMENTARY, elm_config_icon_theme_get()))
           {
-             ret = _icon_freedesktop_set(obj, "hicolor", name, _icon_size_min_get(obj));
+             ret = _icon_standard_set(obj, name);
+             if (ret && fdo) *fdo = EINA_FALSE;
+
+             if (!ret)
+               {
+                  ret = _icon_freedesktop_set(obj, "hicolor", name, _icon_size_min_get(obj));
+                  if (ret && fdo) *fdo = EINA_TRUE;
+               }
+          }
+        else
+          {
+             ret = _icon_freedesktop_set(obj, NULL, name, _icon_size_min_get(obj));
              if (ret && fdo) *fdo = EINA_TRUE;
           }
      }
-   else
-     {
-        ret = _icon_freedesktop_set(obj, NULL, name, _icon_size_min_get(obj));
-        if (ret && fdo) *fdo = EINA_TRUE;
-     }
 
    if (ret)
      {
@@ -452,7 +443,7 @@ _internal_elm_icon_standard_set(Evas_Object *obj,
         return EINA_TRUE;
      }
 
-   if (_path_is_absolute(name))
+   if (!eina_file_path_relative(name))
      {
         if (fdo)
           *fdo = EINA_FALSE;

src/lib/elementary/elm_main.c

@@ -1044,7 +1044,7 @@ elm_quicklaunch_prepare(int    argc,
    strcat(p, "../lib/");
    strcat(p, exename);
    strcat(p, LIBEXT);
-   if (access(exe2, R_OK | X_OK) != 0)
+   if (!eina_file_access(exe2, EINA_FILE_ACCESS_MODE_EXEC | EINA_FILE_ACCESS_MODE_READ))
      ELM_SAFE_FREE(exe2, free);
 
    /* Try linking to executable first. Works with PIE files. */
@@ -1308,7 +1308,7 @@ elm_quicklaunch_exe_path_get(const char *exe, const char *cwd)
    const char *pathitr;
    const Eina_List *l;
    char buf[PATH_MAX];
-   if (exe[0] == '/') return strdup(exe);
+   if (!eina_file_path_relative(exe)) return strdup(exe);
    if (cwd)
      pathlist = eina_list_append(pathlist, eina_stringshare_add(cwd));
    else
@@ -1348,7 +1348,7 @@ elm_quicklaunch_exe_path_get(const char *exe, const char *cwd)
    EINA_LIST_FOREACH(pathlist, l, pathitr)
      {
         snprintf(buf, sizeof(buf), "%s/%s", pathitr, exe);
-        if (!access(buf, R_OK | X_OK)) return strdup(buf);
+        if (eina_file_access(buf, EINA_FILE_ACCESS_MODE_EXEC | EINA_FILE_ACCESS_MODE_READ)) return strdup(buf);
      }
    return NULL;
 }

src/lib/elementary/elm_module.c

@@ -203,7 +203,7 @@ _elm_module_add(const char *name, const char *as)
 {
    Elm_Module *m;
 
-   if (name[0] == '/') return NULL;
+   if (!eina_file_path_relative(name)) return NULL;
 
    m = eina_hash_find(modules, name);
    if (m)

src/lib/elementary/elm_prefs.c

@@ -3,7 +3,7 @@
 #endif
 
 #ifdef _WIN32
-# include <evil_private.h> /* strsep evil_path_absolute */
+# include <evil_private.h> /* strsep */
 #endif
 
 #define EFL_ACCESS_OBJECT_PROTECTED
@@ -1816,11 +1816,7 @@ elm_prefs_file_set(Eo *obj, const char *file, const char *page)
      sd->file = eina_stringshare_printf("%s/%s", prefix, "preferences.epb");
    else
      {
-#ifndef _WIN32
-        if (*file != '/') /* relative */
-#else
-        if (!evil_path_is_absolute(file)) /* relative */
-#endif
+        if (eina_file_path_relative(file))
           sd->file = eina_stringshare_printf("%s/%s", prefix, file);
         else
           sd->file = eina_stringshare_add(file);

src/lib/elementary/elm_theme.c

@@ -107,10 +107,9 @@ _elm_theme_file_item_add(Eina_Inlist **files, const char *item, Eina_Bool prepen
    home = eina_environment_home_get();
    buf = eina_strbuf_new();
 
-   if ((item[0] == '/') ||
+   if (!eina_file_path_relative(item) ||
        ((item[0] == '.') && (item[1] == '/')) ||
-       ((item[0] == '.') && (item[1] == '.') && (item[2] == '/')) ||
-       ((isalpha(item[0])) && (item[1] == ':')))
+       ((item[0] == '.') && (item[1] == '.') && (item[2] == '/')))
      {
         f = eina_file_open(item, EINA_FALSE);
         if (!f) goto on_error;
@@ -898,9 +897,9 @@ elm_theme_list_item_path_get(const char *f, Eina_Bool *in_search_path)
         if (!home) home = "";
      }
 
-   if ((f[0] == '/') || ((f[0] == '.') && (f[1] == '/')) ||
-       ((f[0] == '.') && (f[1] == '.') && (f[2] == '/')) ||
-       ((isalpha(f[0])) && (f[1] == ':')))
+   if (!eina_file_path_relative(f) ||
+       ((f[0] == '.') && (f[1] == '/')) ||
+       ((f[0] == '.') && (f[1] == '.') && (f[2] == '/')))
      {
         if (in_search_path) *in_search_path = EINA_FALSE;
         return strdup(f);

src/lib/elementary/meson.build

@@ -702,6 +702,7 @@ elementary_pub_headers = [
   'elm_view_form_eo.h',
   'elm_view_list_eo.h',
   'elm_web_eo.legacy.h',
+  'elm_widget_item_container_eo.h',
   'elm_widget_item_container_eo.legacy.h',
   'elm_widget_item_eo.legacy.h',
   'elm_widget_item_static_focus_eo.legacy.h',

src/lib/elput/TODO

@@ -0,0 +1,4 @@
+Look at implementing support for libei for emulated input support
+(Simotek request)
+
+https://gitlab.freedesktop.org/libinput/libei

src/lib/elua/elua.c

@@ -193,11 +193,13 @@ elua_state_new(const char *progname)
    lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr1");
    lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr2");
    return ret;
+#ifdef ENABLE_LUA_OLD
 err:
    lua_close(L);
    eina_stringshare_del(ret->progname);
    free(ret);
    return NULL;
+#endif
 }
 
 EAPI void

src/lib/emile/emile_base64.c

@@ -94,7 +94,7 @@ emile_base64_encode_common(const Eina_Binbuf *in, Eina_Bool is_base64url_encode)
 
    dest[k] = '\0';
 
-   return eina_strbuf_manage_new(dest);
+   return eina_strbuf_manage_new_length(dest, k);
 }
 
 static Eina_Binbuf *

src/lib/eo/eo_ptr_indirection.c

@@ -94,19 +94,20 @@ _eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file,
    EINA_PREFETCH(&(data->tables[0]));
    domain = (obj_id >> SHIFT_DOMAIN) & MASK_DOMAIN;
    tdata = _eo_table_data_table_get(data, domain);
-   EINA_PREFETCH(&(tdata->cache.id));
    if (EINA_UNLIKELY(!tdata)) goto err;
-
+   _eo_cache_prefetch(tdata);
 
    if (EINA_LIKELY(domain != EFL_ID_DOMAIN_SHARED))
      {
-        if (obj_id == tdata->cache.id)
-          return tdata->cache.object;
+        _Eo_Object *obj;
+
+        obj = _eo_cache_find(tdata, obj_id);
+        if (obj) return obj;
 
         mid_table_id = (obj_id >> SHIFT_MID_TABLE_ID) & MASK_MID_TABLE_ID;
-        EINA_PREFETCH_NOCACHE(&(tdata->eo_ids_tables[mid_table_id])); //prefetch for line 119
+        EINA_PREFETCH(&(tdata->eo_ids_tables[mid_table_id])); //prefetch for line 119
         table_id = (obj_id >> SHIFT_TABLE_ID) & MASK_TABLE_ID;
-        EINA_PREFETCH_NOCACHE((tdata->eo_ids_tables[mid_table_id] + table_id)); //prefetch for line 121
+        EINA_PREFETCH((tdata->eo_ids_tables[mid_table_id] + table_id)); //prefetch for line 121
         entry_id = (obj_id >> SHIFT_ENTRY_ID) & MASK_ENTRY_ID;
         generation = obj_id & MASK_GENERATIONS;
 
@@ -126,8 +127,7 @@ _eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file,
                   if (entry->active && (entry->generation == generation))
                     {
                        // Cache the result of that lookup
-                       tdata->cache.object = entry->ptr;
-                       tdata->cache.id = obj_id;
+                       _eo_cache_store(tdata, obj_id, entry->ptr);
                        return entry->ptr;
                     }
                }
@@ -136,17 +136,19 @@ _eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file,
      }
    else
      {
+        _Eo_Object *obj;
+
         eina_lock_take(&(_eo_table_data_shared_data->obj_lock));
-        if (obj_id == tdata->cache.id)
         // yes we return keeping the lock locked. that's why
         // you must call _eo_obj_pointer_done() wrapped
         // by EO_OBJ_DONE() to release
-          return tdata->cache.object;
+        obj = _eo_cache_find(tdata, obj_id);
+        if (obj) return obj;
 
         mid_table_id = (obj_id >> SHIFT_MID_TABLE_ID) & MASK_MID_TABLE_ID;
-        EINA_PREFETCH_NOCACHE(&(tdata->eo_ids_tables[mid_table_id]));
+        EINA_PREFETCH(&(tdata->eo_ids_tables[mid_table_id]));
         table_id = (obj_id >> SHIFT_TABLE_ID) & MASK_TABLE_ID;
-        EINA_PREFETCH_NOCACHE((tdata->eo_ids_tables[mid_table_id] + table_id));
+        EINA_PREFETCH((tdata->eo_ids_tables[mid_table_id] + table_id));
         entry_id = (obj_id >> SHIFT_ENTRY_ID) & MASK_ENTRY_ID;
         generation = obj_id & MASK_GENERATIONS;
 
@@ -167,8 +169,7 @@ _eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file,
                   if (entry->active && (entry->generation == generation))
                     {
                        // Cache the result of that lookup
-                       tdata->cache.object = entry->ptr;
-                       tdata->cache.id = obj_id;
+                       _eo_cache_store(tdata, obj_id, entry->ptr);
                        // yes we return keeping the lock locked. that's why
                        // you must call _eo_obj_pointer_done() wrapped
                        // by EO_OBJ_DONE() to release

src/lib/eo/eo_ptr_indirection.x

@@ -305,13 +305,19 @@ typedef struct
 typedef struct _Eo_Id_Data       Eo_Id_Data;
 typedef struct _Eo_Id_Table_Data Eo_Id_Table_Data;
 
+#define CACHENUM 2
+#define CACHELINE 64
+#define CACHELRU 1
+
 struct _Eo_Id_Table_Data
 {
    /* Cached eoid lookups */
+#if CACHENUM > 0
+   Eo_Id             cache_id[CACHENUM];
+   _Eo_Object       *cache_object[CACHENUM];
+#endif
    struct
      {
-        Eo_Id             id;
-        _Eo_Object       *object;
         const Eo         *isa_id;
         const Efl_Class  *klass;
         Eina_Bool         isa;
@@ -343,6 +349,100 @@ extern Eina_TLS          _eo_table_data;
 extern Eo_Id_Data       *_eo_table_data_shared;
 extern Eo_Id_Table_Data *_eo_table_data_shared_data;
 
+#ifndef CACHELRU
+static inline unsigned int
+_eo_cache_slot_get(void)
+{
+# if CACHENUM > 0
+  static unsigned int num = 0;
+
+  return (++num) % CACHENUM;
+# endif
+}
+#endif
+
+static inline void
+_eo_cache_prefetch(Eo_Id_Table_Data *tdata EINA_UNUSED)
+{
+#if CACHENUM > 0
+  int i;
+
+  for (i = 0; i < CACHENUM; i += (CACHELINE / sizeof(void *)))
+    {
+       EINA_PREFETCH(&(tdata->cache_id[i]));
+       if ((sizeof(void *) * CACHENUM) >= CACHELINE)
+         {
+            EINA_PREFETCH(&(tdata->cache_object[i]));
+         }
+    }
+#endif
+}
+
+static inline _Eo_Object *
+_eo_cache_find(Eo_Id_Table_Data *tdata EINA_UNUSED, Eo_Id obj_id EINA_UNUSED)
+{
+#if CACHENUM > 0
+  int i;
+
+  for (i = 0; i < CACHENUM; i++)
+    {
+       if (obj_id == tdata->cache_id[i]) return tdata->cache_object[i];
+    }
+#endif
+  return NULL;
+}
+
+static inline void
+_eo_cache_store(Eo_Id_Table_Data *tdata EINA_UNUSED, Eo_Id obj_id EINA_UNUSED, _Eo_Object *obj EINA_UNUSED)
+{
+#if CACHENUM > 0
+# ifdef CACHELRU
+#  if CACHENUM > 1
+   memmove(&tdata->cache_id[1], &tdata->cache_id[0],
+           (CACHENUM - 1) * sizeof(tdata->cache_id[0]));
+   memmove(&tdata->cache_object[1], &tdata->cache_object[0],
+           (CACHENUM - 1) * sizeof(tdata->cache_object[0]));
+#  endif
+   tdata->cache_id[0] = obj_id;
+   tdata->cache_object[0] = obj;
+# else
+   int slot = _eo_cache_slot_get();
+   tdata->cache_id[slot] = obj_id;
+   tdata->cache_object[slot] = obj;
+# endif
+#endif
+}
+
+static inline void
+_eo_cache_invalidate(Eo_Id_Table_Data *tdata EINA_UNUSED, Eo_Id obj_id EINA_UNUSED)
+{
+#if CACHENUM > 0
+  int i;
+
+  for (i = 0; i < CACHENUM; i++)
+    {
+      if (obj_id == tdata->cache_id[i])
+        {
+# ifdef CACHELRU
+           if (EINA_LIKELY((CACHENUM - 1 - i) > 0))
+             {
+                memmove(&tdata->cache_id[i], &tdata->cache_id[i + 1],
+                        (CACHENUM - 1 - i) * sizeof(tdata->cache_id[0]));
+                memmove(&tdata->cache_object[i], &tdata->cache_object[i + 1],
+                        (CACHENUM - 1 - i) * sizeof(tdata->cache_object[0]));
+             }
+           tdata->cache_id[CACHENUM - 1] = 0;
+           tdata->cache_object[CACHENUM - 1] = NULL;
+# else
+           tdata->cache_id[i] = 0;
+           tdata->cache_object[i] = NULL;
+# endif
+           return;
+        }
+    }
+#endif
+}
+
 static inline Eo_Id_Table_Data *
 _eo_table_data_table_new(Efl_Id_Domain domain)
 {
@@ -672,11 +772,7 @@ _eo_id_release(const Eo_Id obj_id)
                          tdata->current_table = NULL;
                     }
                   // In case an object is destroyed, wipe out the cache
-                  if (tdata->cache.id == obj_id)
-                    {
-                       tdata->cache.id = 0;
-                       tdata->cache.object = NULL;
-                    }
+                  _eo_cache_invalidate(tdata, obj_id);
                   if ((Eo_Id)tdata->cache.isa_id == obj_id)
                     {
                        tdata->cache.isa_id = NULL;
@@ -722,11 +818,7 @@ _eo_id_release(const Eo_Id obj_id)
                          tdata->current_table = NULL;
                     }
                   // In case an object is destroyed, wipe out the cache
-                  if (tdata->cache.id == obj_id)
-                    {
-                       tdata->cache.id = 0;
-                       tdata->cache.object = NULL;
-                    }
+                  _eo_cache_invalidate(tdata, obj_id);
                   if ((Eo_Id)tdata->cache.isa_id == obj_id)
                     {
                        tdata->cache.isa_id = NULL;

src/lib/ethumb/ethumb.c

@@ -852,7 +852,7 @@ ethumb_file_set(Ethumb *e, const char *path, const char *key)
 
    sanitized_path = eina_file_path_sanitize(path);
    DBG("ethumb=%p, path=%s, key=%s", e, sanitized_path ? sanitized_path : "", key ? key : "");
-   if (sanitized_path && access(sanitized_path, R_OK))
+   if (sanitized_path && !eina_file_access(sanitized_path, EINA_FILE_ACCESS_MODE_READ))
      {
         free(sanitized_path);
         return EINA_FALSE;

src/lib/evas/cache/evas_cache_image.c

@@ -201,13 +201,8 @@ _timestamp_compare(Image_Timestamp *tstamp, struct stat *st)
    if (tstamp->size != st->st_size) return EINA_FALSE;
    if (tstamp->ino != st->st_ino) return EINA_FALSE;
 #ifdef _STAT_VER_LINUX
-#if (defined __USE_MISC && defined st_mtime)
    if (tstamp->mtime_nsec != (unsigned long int)st->st_mtim.tv_nsec)
      return EINA_FALSE;
-#else
-   if (tstamp->mtime_nsec != (unsigned long int)st->st_mtimensec)
-     return EINA_FALSE;
-#endif
 #endif
    return EINA_TRUE;
 }
@@ -219,11 +214,7 @@ _timestamp_build(Image_Timestamp *tstamp, struct stat *st)
    tstamp->size = st->st_size;
    tstamp->ino = st->st_ino;
 #ifdef _STAT_VER_LINUX
-#if (defined __USE_MISC && defined st_mtime)
    tstamp->mtime_nsec = (unsigned long int)st->st_mtim.tv_nsec;
-#else
-   tstamp->mtime_nsec = (unsigned long int)st->st_mtimensec;
-#endif
 #endif
 }
 

src/lib/evas/canvas/evas_font_dir.c

@@ -2,10 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef _WIN32
-# include <evil_private.h> /* evil_path_is_absolute */
-#endif
-
 #include <Eet.h>
 
 #ifdef HAVE_FONTCONFIG
@@ -67,17 +63,6 @@ static FcConfig *fc_config = NULL;
 /* get the casefold feature! */
 #include <unistd.h>
 #include <sys/param.h>
-int
-_file_path_is_full_path(const char *path)
-{
-   if (!path) return 0;
-#ifdef _WIN32
-   if (evil_path_is_absolute(path)) return 1;
-#else
-   if (path[0] == '/') return 1;
-#endif
-   return 0;
-}
 
 static DATA64
 _file_modified_time(const char *file)
@@ -787,7 +772,7 @@ evas_font_load(const Eina_List *font_paths, int hinting, Evas_Font_Description *
                }
              if (!font) /* Source load failed */
                {
-                  if (_file_path_is_full_path((char *)nm)) /* Try filename */
+                  if (!eina_file_path_relative((char *)nm)) /* Try filename */
                     font = (Evas_Font_Set *)evas_common_font_load((char *)nm, size, wanted_rend, bitmap_scalable);
                   else /* search font path */
                     {
@@ -856,7 +841,7 @@ evas_font_load(const Eina_List *font_paths, int hinting, Evas_Font_Description *
                }
              if (!ok)
                {
-                  if (_file_path_is_full_path((char *)nm))
+                  if (!eina_file_path_relative((char *)nm))
                     evas_common_font_add((RGBA_Font *)font, (char *)nm, size, wanted_rend, bitmap_scalable);
                   else
                     {

src/lib/evas/canvas/evas_object_textblock.c

@@ -976,7 +976,7 @@ struct _Escape_Value
    size_t value_len;
 };
 
-#define ESCAPE_VALUE(e,v) {e,v,strlen(e),strlen(v)}
+#define ESCAPE_VALUE(e,v) {e,v,sizeof(e)-1,sizeof(v)-1}
 
 /**
  * @internal

src/lib/evas/common/evas_draw.h

@@ -25,6 +25,8 @@ EVAS_API Cutout_Rects      *evas_common_draw_context_cutouts_new             (vo
 EVAS_API void               evas_common_draw_context_cutouts_free            (Cutout_Rects* rects);
 EVAS_API void               evas_common_draw_context_cutouts_real_free       (Cutout_Rects* rects);
 EVAS_API void               evas_common_draw_context_cutouts_del             (Cutout_Rects* rects, int idx);
+EVAS_API void               evas_common_draw_context_cutout_max_set          (RGBA_Draw_Context *dc, int max);
+EVAS_API void               evas_common_draw_context_cutout_size_min_set     (RGBA_Draw_Context *dc, int min);
 EVAS_API void               evas_common_draw_context_add_cutout              (RGBA_Draw_Context *dc, int x, int y, int w, int h);
 EVAS_API void               evas_common_draw_context_clear_cutouts           (RGBA_Draw_Context *dc);
 EVAS_API Cutout_Rects      *evas_common_draw_context_apply_cutouts           (RGBA_Draw_Context *dc, Cutout_Rects *recycle);

src/lib/evas/common/evas_draw_main.c

@@ -174,6 +174,8 @@ evas_common_draw_context_new(void)
    dc = _evas_common_draw_context_find();
    if (!dc) return NULL;
    memset(dc, 0, sizeof(RGBA_Draw_Context));
+   dc->cutout.count_max = 0x7fffffff;
+   dc->cutout.size_min = 8 * 8;
    return dc;
 }
 
@@ -296,11 +298,23 @@ evas_common_draw_context_unset_multiplier(RGBA_Draw_Context *dc)
    dc->mul.use = 0;
 }
 
+EVAS_API void
+evas_common_draw_context_cutout_max_set(RGBA_Draw_Context *dc, int max)
+{
+   dc->cutout.count_max = max;
+}
+
+EVAS_API void
+evas_common_draw_context_cutout_size_min_set(RGBA_Draw_Context *dc, int min)
+{
+  dc->cutout.size_min = min;
+}
 
 EVAS_API void
 evas_common_draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w, int h)
 {
-//   if (dc->cutout.rects > 512) return;
+   if (dc->cutout.active >= dc->cutout.count_max) return;
+   if ((w * h) < dc->cutout.size_min) return;
    if (dc->clip.use)
      {
 #if 1 // this is a bit faster
@@ -335,8 +349,8 @@ evas_common_draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w,
         RECTS_CLIP_TO_RECT(x, y, w, h,
                            dc->clip.x, dc->clip.y, dc->clip.w, dc->clip.h);
 #endif
+       if ((w * h) < dc->cutout.size_min) return;
      }
-   if ((w * h) <= (8 * 8)) return;
    if (dc->cutout.last_add.w > 0)
      {
         if ((dc->cutout.last_add.x == x) && (dc->cutout.last_add.y == y) &&

src/lib/evas/common/evas_image_load.c

@@ -68,6 +68,8 @@ static const struct ext_loader_s loaders[] =
 
    MATCHING(".jxl", "jxl"),
 
+   MATCHING(".qoi", "qoi"),
+
    MATCHING(".avif", "avif"),
    MATCHING(".avifs", "avif"),
 
@@ -195,8 +197,8 @@ static const struct ext_loader_s loaders[] =
 static const char *loaders_name[] =
 { /* in order of most likely needed */
   "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps",
-  "bmp", "tga", "wbmp", "ico", "psd", "jp2k", "dds", "jxl", "avif", "heif",
-  "generic"
+  "bmp", "tga", "wbmp", "ico", "psd", "jp2k", "dds", "jxl", "qoi", "avif",
+  "heif", "generic"
 };
 
 struct evas_image_foreach_loader_data
@@ -413,11 +415,7 @@ _timestamp_build(Image_Timestamp *tstamp, struct stat *st)
    tstamp->size = st->st_size;
    tstamp->ino = st->st_ino;
 #ifdef _STAT_VER_LINUX
-# if (defined __USE_MISC && defined st_mtime)
    tstamp->mtime_nsec = (unsigned long int)st->st_mtim.tv_nsec;
-# else
-   tstamp->mtime_nsec = (unsigned long int)st->st_mtimensec;
-# endif
 #endif
 }
 

src/lib/evas/common/evas_image_save.c

@@ -37,6 +37,8 @@ evas_common_save_image_to_file(RGBA_Image *im, const char *file, const char *key
           saver = "avif";
         if (!strcasecmp(p, "jxl"))
           saver = "jxl";
+        if (!strcasecmp(p, "qoi"))
+          saver = "qoi";
      }
 
    if (saver)

src/lib/evas/common/evas_text_utils.c

@@ -19,7 +19,7 @@ struct _Color_Name_Value
    unsigned char b;
 };
 
-#define COLOR_NAME(name,r,g,b) {name,(unsigned char)strlen(name),r,g,b}
+#define COLOR_NAME(name,r,g,b) {name,(unsigned char)sizeof(name)-1,r,g,b}
 
 /**
  * @internal

src/lib/evas/file/evas_module.c

@@ -210,6 +210,7 @@ EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, jxl);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, pmaps);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, png);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, psd);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, qoi);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, svg);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tga);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tiff);
@@ -230,6 +231,7 @@ EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, eet);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, jpeg);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, jxl);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, png);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, qoi);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, tiff);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, webp);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, tgv);
@@ -334,6 +336,9 @@ static const struct {
 #ifdef EVAS_STATIC_BUILD_PSD
   EVAS_EINA_STATIC_MODULE_USE(image_loader, psd),
 #endif
+#ifdef EVAS_STATIC_BUILD_QOI
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, qoi),
+#endif
 #ifdef EVAS_STATIC_BUILD_SVG
   EVAS_EINA_STATIC_MODULE_USE(image_loader, svg),
 #endif
@@ -380,6 +385,9 @@ static const struct {
 #ifdef EVAS_STATIC_BUILD_PNG
   EVAS_EINA_STATIC_MODULE_USE(image_saver, png),
 #endif
+#ifdef EVAS_STATIC_BUILD_QOI
+  EVAS_EINA_STATIC_MODULE_USE(image_saver, qoi),
+#endif
 #ifdef EVAS_STATIC_BUILD_TIFF
   EVAS_EINA_STATIC_MODULE_USE(image_saver, tiff),
 #endif

src/lib/evas/file/evas_path.c

@@ -15,10 +15,6 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#ifdef _WIN32
-# include <evil_private.h> /* evil_path_is_absolute */
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 
@@ -28,18 +24,6 @@
 # define EVAS_PATH_SEPARATOR "/"
 #endif
 
-int
-evas_file_path_is_full_path(const char *path)
-{
-   if (!path) return 0;
-#ifdef _WIN32
-   if (evil_path_is_absolute(path)) return 1;
-#else
-   if (path[0] == '/') return 1;
-#endif
-   return 0;
-}
-
 char *
 evas_file_path_join(const char *path, const char *end)
 {

src/lib/evas/file/evas_path.h

@@ -2,7 +2,6 @@
 #define _EVAS_PATH_H
 
 
-int        evas_file_path_is_full_path (const char *path);
 char      *evas_file_path_join         (const char *path, const char *end);
 int        evas_file_path_exists       (const char *path);
 int        evas_file_path_is_file      (const char *path);

src/lib/evas/filters/evas_filter_utils.c

@@ -92,9 +92,18 @@ _interpolate_linear(DATA8 *output, int *points)
      {
         if (points[j] != -1)
           {
+             int val1, val2, vald, pos, len;
+
              output[j] = (DATA8) points[j];
+             val1 = points[last_idx];
+             val2 = points[j];
+             vald = val2 - val1;
+             len = j - last_idx;
              for (k = last_idx + 1; k < j; k++)
-               output[k] = (DATA8) (points[j] + ((k - last_idx) * (points[j] - points[last_idx]) / (j - last_idx)));
+               {
+                  pos = k - last_idx;
+                  output[k] = (DATA8) (val1 + ((pos * vald) / len));
+               }
              last_idx = j;
           }
      }

src/lib/evas/include/evas_common_private.h

@@ -645,6 +645,8 @@ struct _Cutout_Rects
    Cutout_Rect      *rects;
    int               active;
    int               max;
+   int               count_max;
+   int               size_min;
    struct {
       int            x, w, y, h;
    } last_add;

src/lib/evas/meson.build

@@ -21,7 +21,7 @@ evas_image_loaders_file = [
      ['eet',     'static', [eet]],
      ['generic', 'shared', [rt]],
      ['gif',     'shared', [giflib]],
-     ['heif',    'shared', [heif]],
+     ['heif',    'shared', []],
      ['ico',     'shared', []],
      ['jpeg',    'static', [jpeg]],
      ['jp2k',    'shared', [libopenjp2]],
@@ -29,6 +29,7 @@ evas_image_loaders_file = [
      ['pmaps',   'shared', []],
      ['png',     'static', [png]],
      ['psd',     'shared', []],
+     ['qoi',     'shared', []],
      ['tga',     'shared', []],
      ['tgv',     'shared', [rg_etc, lz4]],
      ['tiff',    'shared', [tiff]],
@@ -43,6 +44,7 @@ evas_image_savers_file = [
      ['jpeg',    'static', [jpeg]],
      ['jxl' ,    'shared', [libjxl, libjxl_threads]],
      ['png',     'static', [png]],
+     ['qoi',     'shared', []],
      ['tgv',     'shared', [rg_etc, lz4]],
      ['tiff',    'shared', [tiff]],
      ['webp',    'shared', [webp]],

src/lib/evil/evil_util.c

@@ -188,25 +188,3 @@ _evil_last_error_display(const char *fct)
 {
    fprintf(stderr, "[Evil] [%s] ERROR: %s\n", fct, evil_last_error_get());
 }
-
-EVIL_API int
-evil_path_is_absolute(const char *path)
-{
-   size_t length;
-
-   if (!path)
-     return 0;
-
-   if (*path == '/' || *path == '\\') return 1;
-
-   length = strlen(path);
-   if (length < 3) return 0;
-
-   if ((((*path >= 'a') && (*path <= 'z')) ||
-        ((*path >= 'A') && (*path <= 'Z'))) &&
-       (path[1] == ':') &&
-       ((path[2] == '/') || (path[2] == '\\')))
-     return 1;
-
-   return 0;
-}