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

.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

ChangeLog

@@ -1,3 +1,4 @@
+2021-10-14 master
 2021-05-29 17.0.1
 - Fixes:
   - Crash on panel cleanup in single-monitor execp (issue #801)

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 best_match = 0;
-    int match_right = 0;
+    int best_area = -1;
-    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.
     for (int i = 0; i < server.num_monitors; i++) {
-        if (x >= server.monitors[i].x && x <= (server.monitors[i].x + server.monitors[i].width) &&
+        int commonx = get_interval_overlap(x, x + w, server.monitors[i].x, server.monitors[i].x + server.monitors[i].width);
-            y >= server.monitors[i].y && y <= (server.monitors[i].y + server.monitors[i].height)) {
+        int commony = get_interval_overlap(y, y + h, server.monitors[i].y, server.monitors[i].y + server.monitors[i].height);
-            int current_right = x < (server.monitors[i].x + server.monitors[i].width);
+        int area = commonx * commony;
-            int current_bottom = y < (server.monitors[i].y + server.monitors[i].height);
+        if (0)
-            if (best_match < 0 || (!match_right && current_right) || (!match_bottom && current_bottom)) {
+            printf("Monitor %d (%dx%d+%dx%d): win (%dx%d+%dx%d) area %dx%d=%d\n",
-                best_match = i;
+                   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;
 }