Configure SAST in .gitlab-ci.yml, creating this file if it does not already exist

Attempt to fix get window monitor
Update .gitlab-ci.yml file
2021-11-14 17:36:34 +00:00 · 2021-11-14 10:24:14 +01:00 · 2021-06-27 23:47:21 +00:00 · 2021-06-28 01:25:46 +02:00 · 2021-05-29 11:24:56 +02:00 · 2021-05-01 19:16:51 +02:00
10 changed files with 86 additions and 27 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,41 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
+stages:
+- build
+- test
+- release
+variables:
+  DEBIAN_FRONTEND: noninteractive
+job-build:
+  stage: build
+  image: ubuntu:rolling
+  script:
+  - sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
+  - apt-get update
+  - apt-get build-dep -y tint2
+  - apt-get install -y libgtk-3-dev git
+  - git clean -ffdx
+  - mkdir build
+  - cd build
+  - cmake ..
+  - make -j
+job-release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+  - if: "$CI_COMMIT_TAG =~ /^v.*/"
+  script:
+  - echo 'running release_job'
+  release:
+    name: Release $CI_COMMIT_TAG
+    description: Release $CI_COMMIT_TAG / $CI_COMMIT_SHA
+    tag_name: "$CI_COMMIT_TAG"
+    ref: "$CI_COMMIT_SHA"
+sast:
+  stage: test
+include:
+- template: Security/SAST.gitlab-ci.yml
--- a/4
+++ b/4
@@ -1,3 +1,7 @@
+2021-10-14 master
+2021-05-29 17.0.1
+- Fixes:
+  - Crash on panel cleanup in single-monitor execp (issue #801)
 2021-04-18 17.0
 - Fixes:
  - Crash when a window icon is large (issue #786) (santouits)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 17.0
-Changes: https://gitlab.com/o9000/tint2/blob/17.0/ChangeLog
+# Latest stable release: 17.0.1
+Changes: https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog

 Documentation: [doc/tint2.md](doc/tint2.md)

@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 17.0
+git checkout 17.0.1
 mkdir build
 cd build
 cmake ..
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -199,9 +199,9 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-17-0"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0</span><a name="latest-stable-release-17-0" href="#latest-stable-release-17-0" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><div class="highlight"><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+<h1 id="latest-stable-release-17-0-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0.1</span><a name="latest-stable-release-17-0-1" href="#latest-stable-release-17-0-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><div class="highlight"><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 17.0
+git checkout 17.0.1
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2021\-04\-18" 17.0
+.TH TINT2 1 "2021\-05\-29" 17.0.1
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2021-04-18" 17.0
+# TINT2 1 "2021-05-29" 17.0.1

 ## NAME
 tint2 - lightweight panel/taskbar
--- a/src/execplugin/execplugin.c
+++ b/src/execplugin/execplugin.c
@@ -66,7 +66,8 @@ gpointer create_execp_frontend(gconstpointer arg, gpointer data)
               execp_backend->backend->monitor, panel->monitor);
        Execp *dummy = create_execp();
        dummy->frontend = (ExecpFrontend *)calloc(1, sizeof(ExecpFrontend));
-        dummy->backend->instances = g_list_append(execp_backend->backend->instances, dummy);
+        dummy->backend->instances = g_list_append(dummy->backend->instances, dummy);
+        dummy->dummy = true;
        return dummy;
    }
    printf("Creating executor '%s' with monitor %d for panel on monitor %d\n",
@@ -89,7 +90,11 @@ void destroy_execp(void *obj)
        free_and_null(execp->frontend);
        remove_area(&execp->area);
        free_area(&execp->area);
-        free_and_null(execp);
+        if (execp->dummy) {
+            destroy_execp(execp);
+        } else {
+            free_and_null(execp);
+        }
    } else {
        // This is a backend element
        destroy_timer(&execp->backend->timer);
--- a/src/execplugin/execplugin.h
+++ b/src/execplugin/execplugin.h
@@ -97,6 +97,7 @@ typedef struct Execp {
    ExecpBackend *backend;
    // Set only for frontend Execp items.
    ExecpFrontend *frontend;
+    bool dummy;
 } Execp;

 // Called before the config is read and panel_config/panels are created.
--- a/src/util/signals.c
+++ b/src/util/signals.c
@@ -85,7 +85,6 @@ static void sigchld_handler(int sig)
    int savedErrno = errno;
    ssize_t unused = write(sigchild_pipe[1], "x", 1);
    (void)unused;
-    fsync(sigchild_pipe[1]);
    errno = savedErrno;
 }

--- a/src/util/window.c
+++ b/src/util/window.c
@@ -169,31 +169,40 @@ int get_window_desktop(Window win)
    return best_match;
 }

+#define swap(a, b) do { __typeof__(a) _tmp = (a); (a) = (b); (b) = _tmp; } while(0)
+
+int get_interval_overlap(int a1, int a2, int b1, int b2)
+{
+    if (a1 > b1) {
+        swap(a1, b1);
+        swap(a2, b2);
+    }
+    if (b1 <= a2)
+        return a2 - b1;
+    return 0;
+}
+
 int get_window_monitor(Window win)
 {
    int x, y, w, h;
    get_window_coordinates(win, &x, &y, &w, &h);

-    int best_match = -1;
-    int match_right = 0;
-    int match_bottom = 0;
-    // There is an ambiguity when a window is right on the edge between screens.
-    // In that case, prefer the monitor which is on the right and bottom of the window's top-left corner.
+    int best_match = 0;
+    int best_area = -1;
    for (int i = 0; i < server.num_monitors; i++) {
-        if (x >= server.monitors[i].x && x <= (server.monitors[i].x + server.monitors[i].width) &&
-            y >= server.monitors[i].y && y <= (server.monitors[i].y + server.monitors[i].height)) {
-            int current_right = x < (server.monitors[i].x + server.monitors[i].width);
-            int current_bottom = y < (server.monitors[i].y + server.monitors[i].height);
-            if (best_match < 0 || (!match_right && current_right) || (!match_bottom && current_bottom)) {
-                best_match = i;
-            }
+        int commonx = get_interval_overlap(x, x + w, server.monitors[i].x, server.monitors[i].x + server.monitors[i].width);
+        int commony = get_interval_overlap(y, y + h, server.monitors[i].y, server.monitors[i].y + server.monitors[i].height);
+        int area = commonx * commony;
+        if (0)
+            printf("Monitor %d (%dx%d+%dx%d): win (%dx%d+%dx%d) area %dx%d=%d\n",
+                   i, server.monitors[i].x, server.monitors[i].y, server.monitors[i].width, server.monitors[i].height,
+                   x, y, w, h,
+                   commonx, commony, area);
+        if (area > best_area) {
+            best_area = area;
+            best_match = i;
        }
    }
-
-    if (best_match < 0)
-        best_match = 0;
-    // fprintf(stderr, "tint2: desktop %d, window %lx %s : monitor %d, (%d, %d)\n", 1 + get_current_desktop(), win,
-    // get_task(win) ? get_task(win)->title : "??", best_match+1, x, y);
    return best_match;
 }
Author	SHA1	Message	Date
Chris	93d0586b6d	Configure SAST in `.gitlab-ci.yml`, creating this file if it does not already exist	2021-11-14 17:36:34 +00:00
Chris Lee	2ed026ba32	Attempt to fix get window monitor	2021-11-14 10:24:14 +01:00
Chris	a4996c84bd	Update .gitlab-ci.yml file	2021-06-27 23:47:21 +00:00
Chris Lee	7b42055a20	add ci pipeline	2021-06-28 01:25:46 +02:00
Chris Lee	f628cba966	Release 17.0.1	2021-05-29 11:24:56 +02:00
Chris Lee	a922884485	update changelog	2021-05-01 19:16:51 +02:00
Chris Lee	66a6238014	fix crash in single-monitor execp	2021-05-01 19:15:38 +02:00
Chris Lee	5e8c65b87e	remove useless fsync	2021-05-01 19:12:28 +02:00