Release 17.0.2

Update changelog
Add tint2-send to cmake
2021-12-04 10:46:45 +01:00 · 2021-12-04 10:45:36 +01:00 · 2021-11-21 01:23:39 +01: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
8 changed files with 73 additions and 24 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,34 @@
+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'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -286,6 +286,9 @@ add_dependencies( tint2 version )
 set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=${CSTD} ${ASAN_C_FLAGS} ${TRACING_C_FLAGS}" )
 set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}  ${TRACING_L_FLAGS}" )

+add_executable(tint2-send src/tint2-send/tint2-send.c)
+target_link_libraries(tint2-send ${X11_LIBRARIES})
+
 install( TARGETS tint2 DESTINATION bin )
 install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
--- a/3
+++ b/3
@@ -1,3 +1,6 @@
+2021-12-04 17.0.2
+- Fixes:
+  - On dual monitor, when minimizing Chrome window it minimizes on the wrong monitor panel (issue #818)
 2021-05-29 17.0.1
 - Fixes:
  - Crash on panel cleanup in single-monitor execp (issue #801)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 17.0.1
-Changes: https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog
+# Latest stable release: 17.0.2
+Changes: https://gitlab.com/o9000/tint2/blob/17.0.2/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.1
+git checkout 17.0.2
 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-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
+<h1 id="latest-stable-release-17-0-2"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0.2</span><a name="latest-stable-release-17-0-2" href="#latest-stable-release-17-0-2" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0.2/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.1
+git checkout 17.0.2
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2021\-05\-29" 17.0.1
+.TH TINT2 1 "2021\-12\-04" 17.0.2
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2021-05-29" 17.0.1
+# TINT2 1 "2021-12-04" 17.0.2

 ## NAME
 tint2 - lightweight panel/taskbar
--- 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 Lee	f8f9c18cef	Release 17.0.2	2021-12-04 10:46:45 +01:00
Chris Lee	56bccf2b4f	Update changelog	2021-12-04 10:45:36 +01:00
Chris Lee	ec4eccd769	Add tint2-send to cmake	2021-11-21 01:23:39 +01: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