Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sxhkd for openSUSE:Factory checked in at 2021-01-21 21:57:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sxhkd (Old) and /work/SRC/openSUSE:Factory/.sxhkd.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sxhkd" Thu Jan 21 21:57:40 2021 rev:5 rq:865450 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sxhkd/sxhkd.changes 2020-06-11 14:54:39.655271224 +0200 +++ /work/SRC/openSUSE:Factory/.sxhkd.new.28504/sxhkd.changes 2021-01-21 21:57:41.233864442 +0100 @@ -1,0 +2,8 @@ +Fri Jan 15 18:54:45 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 0.6.2: + * Make it build with GCC 10 + * Use preferred X screen + * Sequences can't be nested + +------------------------------------------------------------------- @@ -33 +40,0 @@ - Old: ---- sxhkd-0.6.1.tar.gz New: ---- sxhkd-0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sxhkd.spec ++++++ --- /var/tmp/diff_new_pack.xMaJ6n/_old 2021-01-21 21:57:41.889864707 +0100 +++ /var/tmp/diff_new_pack.xMaJ6n/_new 2021-01-21 21:57:41.893864708 +0100 @@ -1,7 +1,7 @@ # # spec file for package sxhkd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2017 Luke Jones, [email protected] # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: sxhkd -Version: 0.6.1 +Version: 0.6.2 Release: 0 Summary: Simple X hotkey daemon License: BSD-2-Clause @@ -38,8 +38,8 @@ %setup -q %build -export CPPFLAGS="%{optflags} -fcommon" -make %{?_smp_mflags} +export CPPFLAGS="%{optflags}" +%make_build %install %make_install PREFIX=%{_prefix} DOCPREFIX=%{_docdir}/%{name} @@ -51,6 +51,7 @@ %{_bindir}/sxhkd %{_mandir}/man1/sxhkd.1%{?ext_man} %{_docdir}/%{name} +%dir %{_sysconfdir}/skel/.config/ %{_sysconfdir}/skel/.config/sxhkd %config %{_sysconfdir}/skel/.config/sxhkd/sxhkdrc ++++++ sxhkd-0.6.1.tar.gz -> sxhkd-0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/Makefile new/sxhkd-0.6.2/Makefile --- old/sxhkd-0.6.1/Makefile 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/Makefile 2020-08-02 09:53:02.000000000 +0200 @@ -1,5 +1,5 @@ OUT = sxhkd -VERCMD ?= git describe 2> /dev/null +VERCMD ?= git describe --tags 2> /dev/null VERSION := $(shell $(VERCMD) || cat VERSION) CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/README.md new/sxhkd-0.6.2/README.md --- old/sxhkd-0.6.1/README.md 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/README.md 2020-08-02 09:53:02.000000000 +0200 @@ -44,6 +44,17 @@ super + alt + p bspc config focus_follows_pointer {true,false} + # Smart resize, will grow or shrink depending on location. + # Will always grow for floating nodes. + super + ctrl + alt + {Left,Down,Up,Right} + n=10; \ + { d1=left; d2=right; dx=-$n; dy=0; \ + , d1=bottom; d2=top; dx=0; dy=$n; \ + , d1=top; d2=bottom; dx=0; dy=-$n; \ + , d1=right; d2=left; dx=$n; dy=0; \ + } \ + bspc node --resize $d1 $dx $dy || bspc node --resize $d2 $dx $dy + ## Editor Plugins ### Vim diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/VERSION new/sxhkd-0.6.2/VERSION --- old/sxhkd-0.6.1/VERSION 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/VERSION 2020-08-02 09:53:02.000000000 +0200 @@ -1 +1 @@ -0.6.1 \ No newline at end of file +0.6.2 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/doc/sxhkd.1 new/sxhkd-0.6.2/doc/sxhkd.1 --- old/sxhkd-0.6.1/doc/sxhkd.1 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/doc/sxhkd.1 2020-08-02 09:53:02.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: sxhkd .\" Author: [see the "Author" section] -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 08/11/2019 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 08/02/2020 .\" Manual: Sxhkd Manual -.\" Source: Sxhkd 0.6.1 +.\" Source: Sxhkd 0.6.2 .\" Language: English .\" -.TH "SXHKD" "1" "08/11/2019" "Sxhkd 0\&.6\&.1" "Sxhkd Manual" +.TH "SXHKD" "1" "08/02/2020" "Sxhkd 0\&.6\&.2" "Sxhkd Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/src/parse.c new/sxhkd-0.6.2/src/parse.c --- old/sxhkd-0.6.1/src/parse.c 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/src/parse.c 2020-08-02 09:53:02.000000000 +0200 @@ -32,6 +32,9 @@ #include "locales.h" #include "parse.h" +xcb_keysym_t Alt_L, Alt_R, Super_L, Super_R, Hyper_L, Hyper_R, + Meta_L, Meta_R, Mode_switch, Num_Lock, Scroll_Lock; + keysym_dict_t nks_dict[] = {/*{{{*/ {"VoidSymbol" , 0xffffff} , #ifdef XK_MISCELLANY @@ -2441,9 +2444,9 @@ void process_hotkey(char *hotkey_string, char *command_string) { - char hotkey[MAXLEN] = {0}; + char hotkey[2 * MAXLEN] = {0}; char command[2 * MAXLEN] = {0}; - char last_hotkey[MAXLEN] = {0}; + char last_hotkey[2 * MAXLEN] = {0}; unsigned char num_same = 0; chunk_t *hk_chunks = extract_chunks(hotkey_string); chunk_t *cm_chunks = extract_chunks(command_string); @@ -2626,7 +2629,7 @@ chunk_t *make_chunk(void) { - chunk_t *c = malloc(sizeof(chunk_t)); + chunk_t *c = calloc(1, sizeof(chunk_t)); c->sequence = false; c->advance = NULL; c->next = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/src/parse.h new/sxhkd-0.6.2/src/parse.h --- old/sxhkd-0.6.1/src/parse.h 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/src/parse.h 2020-08-02 09:53:02.000000000 +0200 @@ -51,9 +51,6 @@ chunk_t *next; }; -xcb_keysym_t Alt_L, Alt_R, Super_L, Super_R, Hyper_L, Hyper_R, - Meta_L, Meta_R, Mode_switch, Num_Lock, Scroll_Lock; - void load_config(const char *config_file); void parse_event(xcb_generic_event_t *evt, uint8_t event_type, xcb_keysym_t *keysym, xcb_button_t *button, uint16_t *modfield); void process_hotkey(char *hotkey_string, char *command_string); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/src/sxhkd.c new/sxhkd-0.6.2/src/sxhkd.c --- old/sxhkd-0.6.1/src/sxhkd.c 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/src/sxhkd.c 2020-08-02 09:53:02.000000000 +0200 @@ -36,6 +36,30 @@ #include "parse.h" #include "grab.h" +xcb_connection_t *dpy; +xcb_window_t root; +xcb_key_symbols_t *symbols; + +char *shell; +char config_file[MAXLEN]; +char *config_path; +char **extra_confs; +int num_extra_confs; +int redir_fd; +FILE *status_fifo; +char progress[3 * MAXLEN]; +int mapping_count; +int timeout; + +hotkey_t *hotkeys_head, *hotkeys_tail; +bool running, grabbed, toggle_grab, reload, bell, chained, locked; +xcb_keysym_t abort_keysym; +chord_t *abort_chord; + +uint16_t num_lock; +uint16_t caps_lock; +uint16_t scroll_lock; + int main(int argc, char *argv[]) { int opt; @@ -253,10 +277,18 @@ void setup(void) { - dpy = xcb_connect(NULL, NULL); + int screen_idx; + dpy = xcb_connect(NULL, &screen_idx); if (xcb_connection_has_error(dpy)) err("Can't open display.\n"); - xcb_screen_t *screen = xcb_setup_roots_iterator(xcb_get_setup(dpy)).data; + xcb_screen_t *screen = NULL; + xcb_screen_iterator_t screen_iter = xcb_setup_roots_iterator(xcb_get_setup(dpy)); + for (; screen_iter.rem; xcb_screen_next(&screen_iter), screen_idx--) { + if (screen_idx == 0) { + screen = screen_iter.data; + break; + } + } if (screen == NULL) err("Can't acquire screen.\n"); root = screen->root; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/src/sxhkd.h new/sxhkd-0.6.2/src/sxhkd.h --- old/sxhkd-0.6.1/src/sxhkd.h 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/src/sxhkd.h 2020-08-02 09:53:02.000000000 +0200 @@ -42,29 +42,29 @@ #define TIMEOUT_PREFIX 'T' #define TIMEOUT 3 -xcb_connection_t *dpy; -xcb_window_t root; -xcb_key_symbols_t *symbols; +extern xcb_connection_t *dpy; +extern xcb_window_t root; +extern xcb_key_symbols_t *symbols; -char *shell; -char config_file[MAXLEN]; -char *config_path; -char **extra_confs; -int num_extra_confs; -int redir_fd; -FILE *status_fifo; -char progress[3 * MAXLEN]; -int mapping_count; -int timeout; +extern char *shell; +extern char config_file[MAXLEN]; +extern char *config_path; +extern char **extra_confs; +extern int num_extra_confs; +extern int redir_fd; +extern FILE *status_fifo; +extern char progress[3 * MAXLEN]; +extern int mapping_count; +extern int timeout; -hotkey_t *hotkeys_head, *hotkeys_tail; -bool running, grabbed, toggle_grab, reload, bell, chained, locked; -xcb_keysym_t abort_keysym; -chord_t *abort_chord; +extern hotkey_t *hotkeys_head, *hotkeys_tail; +extern bool running, grabbed, toggle_grab, reload, bell, chained, locked; +extern xcb_keysym_t abort_keysym; +extern chord_t *abort_chord; -uint16_t num_lock; -uint16_t caps_lock; -uint16_t scroll_lock; +extern uint16_t num_lock; +extern uint16_t caps_lock; +extern uint16_t scroll_lock; void key_button_event(xcb_generic_event_t *evt, uint8_t event_type); void mapping_notify(xcb_generic_event_t *evt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sxhkd-0.6.1/src/types.h new/sxhkd-0.6.2/src/types.h --- old/sxhkd-0.6.1/src/types.h 2019-08-11 17:57:54.000000000 +0200 +++ new/sxhkd-0.6.2/src/types.h 2020-08-02 09:53:02.000000000 +0200 @@ -34,6 +34,8 @@ #define ESCAPE_KEYSYM 0xff1b #define SYNCHRONOUS_CHAR ';' +extern xcb_keysym_t Mode_switch; + typedef struct chord_t chord_t; struct chord_t { char repr[MAXLEN]; @@ -73,9 +75,6 @@ xcb_keysym_t keysym; } keysym_dict_t; -xcb_keysym_t Alt_L, Alt_R, Super_L, Super_R, Hyper_L, Hyper_R, - Meta_L, Meta_R, Mode_switch, Num_Lock, Scroll_Lock; - hotkey_t *find_hotkey(xcb_keysym_t keysym, xcb_button_t button, uint16_t modfield, uint8_t event_type, bool *replay_event); bool match_chord(chord_t *chord, uint8_t event_type, xcb_keysym_t keysym, xcb_button_t button, uint16_t modfield); chord_t *make_chord(xcb_keysym_t keysym, xcb_button_t button, uint16_t modfield, uint8_t event_type, bool replay_event, bool lock_chain); ++++++ sxhkdrc ++++++ --- /var/tmp/diff_new_pack.xMaJ6n/_old 2021-01-21 21:57:42.009864755 +0100 +++ /var/tmp/diff_new_pack.xMaJ6n/_new 2021-01-21 21:57:42.013864757 +0100 @@ -18,9 +18,9 @@ # bspwm hotkeys # -# quit bspwm normally -super + alt + Escape - bspc quit +# quit/restart bspwm +super + alt + {q,r} + bspc {quit,wm -r} # close and kill super + {_,shift + }w @@ -34,9 +34,9 @@ super + y bspc node newest.marked.local -n newest.!automatic.local -# swap the current node and the biggest node +# swap the current node and the biggest window super + g - bspc node -s biggest + bspc node -s biggest.window # # state/flags @@ -62,9 +62,9 @@ super + {p,b,comma,period} bspc node -f @{parent,brother,first,second} -# focus the next/previous node in the current desktop +# focus the next/previous window in the current desktop super + {_,shift + }c - bspc node -f {next,prev}.local + bspc node -f {next,prev}.local.!hidden.window # focus the next/previous desktop in the current monitor super + bracket{left,right}
