Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bemenu for openSUSE:Factory checked
in at 2022-10-11 18:02:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bemenu (Old)
and /work/SRC/openSUSE:Factory/.bemenu.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bemenu"
Tue Oct 11 18:02:18 2022 rev:17 rq:1009679 version:0.6.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/bemenu/bemenu.changes 2022-10-08
01:25:04.358208688 +0200
+++ /work/SRC/openSUSE:Factory/.bemenu.new.2275/bemenu.changes 2022-10-11
18:04:55.106023567 +0200
@@ -1,0 +2,12 @@
+Tue Oct 11 07:56:02 UTC 2022 - Michael Vetter <mvet...@suse.com>
+
+- Update to 0.6.13:
+ * Add support to disable pointer, touch and keyboard events #311
+
+-------------------------------------------------------------------
+Mon Oct 10 06:21:48 UTC 2022 - Michael Vetter <mvet...@suse.com>
+
+- Update to 0.6.12:
+ * fix dangling pointer state on wayland #310
+
+-------------------------------------------------------------------
Old:
----
bemenu-0.6.11.tar.gz
New:
----
bemenu-0.6.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bemenu.spec ++++++
--- /var/tmp/diff_new_pack.H9j4Nx/_old 2022-10-11 18:04:55.454024130 +0200
+++ /var/tmp/diff_new_pack.H9j4Nx/_new 2022-10-11 18:04:55.458024136 +0200
@@ -18,7 +18,7 @@
%define bcond_with curses
Name: bemenu
-Version: 0.6.11
+Version: 0.6.13
Release: 0
Summary: Dynamic menu library and client program inspired by dmenu
License: MIT
++++++ bemenu-0.6.11.tar.gz -> bemenu-0.6.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bemenu-0.6.11/VERSION new/bemenu-0.6.13/VERSION
--- old/bemenu-0.6.11/VERSION 2022-10-07 06:56:13.000000000 +0200
+++ new/bemenu-0.6.13/VERSION 2022-10-11 07:49:11.000000000 +0200
@@ -1 +1 @@
-0.6.11
+0.6.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bemenu-0.6.11/client/common/common.c
new/bemenu-0.6.13/client/common/common.c
--- old/bemenu-0.6.11/client/common/common.c 2022-10-07 06:56:13.000000000
+0200
+++ new/bemenu-0.6.13/client/common/common.c 2022-10-11 07:49:11.000000000
+0200
@@ -178,6 +178,9 @@
" -I, --index select item at index automatically.\n"
" -x, --password hide input.\n"
" -s, --no-spacing disable the title spacing on entries.\n"
+ " -C, --no-cursor ignore cursor events.\n"
+ " -T, --no-touch ignore touch events.\n"
+ " -K, --no-keyboard ignore keyboard events.\n"
" --scrollbar display scrollbar. (none (default), always,
autohide)\n"
" --accept-single immediately return if there is only one
item.\n"
" --ifne only display menu if there are items.\n"
@@ -274,6 +277,9 @@
{ "grab", no_argument, 0, 'f' },
{ "no-overlap", no_argument, 0, 'n' },
{ "no-spacing", no_argument, 0, 's' },
+ { "no-cursor", no_argument, 0, 'C' },
+ { "no-touch", no_argument, 0, 'T' },
+ { "no-keyboard", no_argument, 0, 'K' },
{ "monitor", required_argument, 0, 'm' },
{ "line-height", required_argument, 0, 'H' },
{ "margin", required_argument, 0, 'M' },
@@ -314,7 +320,7 @@
for (optind = 0;;) {
int32_t opt;
- if ((opt = getopt_long(*argc, *argv, "hviwxcl:I:p:P:I:bfm:H:M:W:B:ns",
opts, NULL)) < 0)
+ if ((opt = getopt_long(*argc, *argv,
"hviwxcl:I:p:P:I:bfm:H:M:W:B:nsCTK", opts, NULL)) < 0)
break;
switch (opt) {
@@ -383,7 +389,15 @@
case 's':
client->no_spacing = true;
break;
-
+ case 'C':
+ client->no_cursor = true;
+ break;
+ case 'T':
+ client->no_touch = true;
+ break;
+ case 'K':
+ client->no_keyboard = true;
+ break;
case 'H':
client->line_height = strtol(optarg, NULL, 10);
break;
@@ -500,7 +514,7 @@
if (!(menu = bm_menu_new(NULL)))
return NULL;
- client->fork = (client->force_fork ||
(bm_renderer_get_priorty(bm_menu_get_renderer(menu)) != BM_PRIO_TERMINAL));
+ client->fork = (client->force_fork ||
(bm_renderer_get_priorty(bm_menu_get_renderer(menu)) != BM_PRIO_TERMINAL));
bm_menu_set_font(menu, client->font);
bm_menu_set_line_height(menu, client->line_height);
@@ -565,7 +579,7 @@
bm_menu_set_filter(menu, client->initial_filter);
uint32_t unicode;
- enum bm_key key;
+ enum bm_key key = BM_KEY_NONE;
struct bm_pointer pointer;
struct bm_touch touch;
enum bm_run_result status = BM_RUN_RESULT_RUNNING;
@@ -574,9 +588,15 @@
status = BM_RUN_RESULT_CANCEL;
break;
}
- key = bm_menu_poll_key(menu, &unicode);
- pointer = bm_menu_poll_pointer(menu);
- touch = bm_menu_poll_touch(menu);
+ if (!client->no_keyboard) {
+ key = bm_menu_poll_key(menu, &unicode);
+ }
+ if (!client->no_cursor) {
+ pointer = bm_menu_poll_pointer(menu);
+ }
+ if (!client->no_touch) {
+ touch = bm_menu_poll_touch(menu);
+ }
} while ((status = bm_menu_run_with_events(menu, key, pointer, touch,
unicode)) == BM_RUN_RESULT_RUNNING);
switch (status) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bemenu-0.6.11/client/common/common.h
new/bemenu-0.6.13/client/common/common.h
--- old/bemenu-0.6.11/client/common/common.h 2022-10-07 06:56:13.000000000
+0200
+++ new/bemenu-0.6.13/client/common/common.h 2022-10-11 07:49:11.000000000
+0200
@@ -30,6 +30,9 @@
bool ifne;
bool no_overlap;
bool no_spacing;
+ bool no_cursor;
+ bool no_touch;
+ bool no_keyboard;
bool force_fork, fork;
bool no_exec;
bool password;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bemenu-0.6.11/darwin.nix new/bemenu-0.6.13/darwin.nix
--- old/bemenu-0.6.11/darwin.nix 2022-10-07 06:56:13.000000000 +0200
+++ new/bemenu-0.6.13/darwin.nix 2022-10-11 07:49:11.000000000 +0200
@@ -1,8 +1,15 @@
{ pkgs ? import <nixpkgs> {} }:
-pkgs.stdenv.mkDerivation rec {
- name = "bemenu";
- src = ./.;
+let
+ src = pkgs.copyPathToStore ./.;
+ semver = builtins.readFile "${src}/VERSION";
+ revision = builtins.readFile (pkgs.runCommand "get-rev" {
+ nativeBuildInputs = with pkgs; [ git ];
+ } "GIT_DIR=${src}/.git git rev-parse --short HEAD | tr -d '\n' > $out");
+in pkgs.stdenv.mkDerivation rec {
+ inherit src;
+ pname = "bemenu";
+ version = "${semver}${revision}";
nativeBuildInputs = with pkgs; [ pkg-config scdoc ];
buildInputs = with pkgs; [ ncurses ];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bemenu-0.6.11/lib/renderers/wayland/wayland.c
new/bemenu-0.6.13/lib/renderers/wayland/wayland.c
--- old/bemenu-0.6.11/lib/renderers/wayland/wayland.c 2022-10-07
06:56:13.000000000 +0200
+++ new/bemenu-0.6.13/lib/renderers/wayland/wayland.c 2022-10-11
07:49:11.000000000 +0200
@@ -248,7 +248,7 @@
struct pointer_event *event = &input->pointer_event;
assert(wayland && event);
- struct bm_pointer bm_pointer;
+ struct bm_pointer bm_pointer = {0};
bm_pointer.event_mask = event->event_mask;
bm_pointer.pos_x = wl_fixed_to_int(event->surface_x);
@@ -270,10 +270,10 @@
}
if (event->state & WL_POINTER_BUTTON_STATE_PRESSED) {
- bm_pointer.state |= POINTER_STATE_PRESSED;
+ bm_pointer.state = POINTER_STATE_PRESSED;
}
if (event->state & WL_POINTER_BUTTON_STATE_RELEASED) {
- bm_pointer.state |= POINTER_STATE_RELEASED;
+ bm_pointer.state = POINTER_STATE_RELEASED;
}
memset(event, 0, sizeof(*event));
