Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package alttab for openSUSE:Factory checked
in at 2023-05-09 13:08:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alttab (Old)
and /work/SRC/openSUSE:Factory/.alttab.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alttab"
Tue May 9 13:08:42 2023 rev:8 rq:1085623 version:1.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/alttab/alttab.changes 2023-03-09
17:46:31.635159334 +0100
+++ /work/SRC/openSUSE:Factory/.alttab.new.1533/alttab.changes 2023-05-09
13:08:48.781547795 +0200
@@ -1,0 +2,10 @@
+Tue May 2 05:59:32 UTC 2023 - Michael Vetter <mvet...@suse.com>
+
+- Update to 1.7.1:
+ * Show username in bottom line: -b 2.
+ * Option -ns to ignore _NET_WM_STATE_SKIP_TASKBAR.
+ * Better man page.
+ * Fix an "empty window name" check,
+ * Fix typographical errors.
+
+-------------------------------------------------------------------
Old:
----
v1.7.0.tar.gz
New:
----
v1.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alttab.spec ++++++
--- /var/tmp/diff_new_pack.Xabi73/_old 2023-05-09 13:08:49.381551366 +0200
+++ /var/tmp/diff_new_pack.Xabi73/_new 2023-05-09 13:08:49.385551390 +0200
@@ -17,7 +17,7 @@
Name: alttab
-Version: 1.7.0
+Version: 1.7.1
Release: 0
Summary: Task Switcher
License: GPL-3.0-only
++++++ v1.7.0.tar.gz -> v1.7.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/ChangeLog new/alttab-1.7.1/ChangeLog
--- old/alttab-1.7.0/ChangeLog 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/ChangeLog 2023-04-29 17:23:23.000000000 +0200
@@ -1,3 +1,16 @@
+2023-04-29 Alexander Kulak <sa-dev@odd.systems>
+
+ version 1.7.1
+
+ Show username in bottom line: -b 2.
+ Option -ns to ignore _NET_WM_STATE_SKIP_TASKBAR.
+ Better man page.
+ Patches from Debian by Peter Pentchev:
+ Fix an "empty window name" check,
+ Fix typographical errors.
+
+ Closes: #147.
+
2023-03-08 Alexander Kulak <sa-dev@odd.systems>
version 1.7.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/README.md new/alttab-1.7.1/README.md
--- old/alttab-1.7.0/README.md 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/README.md 2023-04-29 17:23:23.000000000 +0200
@@ -17,7 +17,7 @@
[-pk <str>] [-nk <str>] [-ck <str>] [-dk <str>] [-mm <N>] [-bm <N>]
[-t NxM] [-i NxM] [-vp str] [-p str] [-s N] [-theme name] [-bg color]
[-fg color] [-frame color] [-inact color] [-bc color] [-bw <N>]
- [-font name] [-vertical] [-e] [-b N] [-v|-vv]
+ [-font name] [-vertical] [-e] [-b N] [-ns] [-v|-vv]
```
(see man page for details)
<!-- ronn page has elements invalid for github markdown, don't link to it -->
@@ -46,5 +46,5 @@
[no-wm](https://github.com/patrickhaller/no-wm): use X11 without a window
manager
â¯
â¯
-alttab (C) Alexander Kulak <sa-dev AT odd POINT systems> 2016-2021
+alttab (C) Alexander Kulak <sa-dev AT odd POINT systems> 2016-2023
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/configure new/alttab-1.7.1/configure
--- old/alttab-1.7.0/configure 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/configure 2023-04-29 17:23:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alttab 1.7.0.
+# Generated by GNU Autoconf 2.69 for alttab 1.7.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='alttab'
PACKAGE_TARNAME='alttab'
-PACKAGE_VERSION='1.7.0'
-PACKAGE_STRING='alttab 1.7.0'
+PACKAGE_VERSION='1.7.1'
+PACKAGE_STRING='alttab 1.7.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1306,7 +1306,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures alttab 1.7.0 to adapt to many kinds of systems.
+\`configure' configures alttab 1.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alttab 1.7.0:";;
+ short | recursive ) echo "Configuration of alttab 1.7.1:";;
esac
cat <<\_ACEOF
@@ -1485,7 +1485,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alttab configure 1.7.0
+alttab configure 1.7.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1737,7 +1737,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by alttab $as_me 1.7.0, which was
+It was created by alttab $as_me 1.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2595,7 +2595,7 @@
# Define the identity of the package.
PACKAGE='alttab'
- VERSION='1.7.0'
+ VERSION='1.7.1'
cat >>confdefs.h <<_ACEOF
@@ -5368,7 +5368,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by alttab $as_me 1.7.0, which was
+This file was extended by alttab $as_me 1.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5434,7 +5434,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-alttab config.status 1.7.0
+alttab config.status 1.7.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/configure.ac
new/alttab-1.7.1/configure.ac
--- old/alttab-1.7.0/configure.ac 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/configure.ac 2023-04-29 17:23:23.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([alttab], [1.7.0])
+AC_INIT([alttab], [1.7.1])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/doc/README new/alttab-1.7.1/doc/README
--- old/alttab-1.7.0/doc/README 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/doc/README 2023-04-29 17:23:23.000000000 +0200
@@ -5,7 +5,7 @@
[-pk <str>] [-nk <str>] [-ck <str>] [-dk <str>] [-mm <N>] [-bm <N>]
[-t NxM] [-i NxM] [-vp str] [-p str] [-s N] [-theme name] [-bg color]
[-fg color] [-frame color] [-inact color] [-bc color] [-bw N]
- [-font name] [-vertical] [-e] [-b N] [-v|-vv]
+ [-font name] [-vertical] [-e] [-b N] [-ns] [-v|-vv]
(see man page for details)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/doc/alttab.1
new/alttab-1.7.1/doc/alttab.1
--- old/alttab-1.7.0/doc/alttab.1 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/doc/alttab.1 2023-04-29 17:23:23.000000000 +0200
@@ -4,7 +4,7 @@
.SH "NAME"
\fBalttab\fR \- the task switcher
.SH "SYNOPSIS"
-\fBalttab\fR [\fB\-w\fR \fIN\fR] [\fB\-d\fR \fIN\fR] [\fB\-sc\fR \fIN\fR]
[\fB\-mk\fR \fIstr\fR] [\fB\-kk\fR \fIstr\fR] [\fB\-bk\fR \fIstr\fR]
[\fB\-pk\fR \fIstr\fR] [\fB\-nk\fR \fIstr\fR] [\fB\-ck\fR \fIstr\fR]
[\fB\-dk\fR \fIstr\fR] [\fB\-mm\fR \fIN\fR] [\fB\-bm\fR \fIN\fR] [\fB\-t\fR
\fINxM\fR] [\fB\-i\fR \fINxM\fR] [\fB\-vp\fR \fIstr\fR] [\fB\-p\fR \fIstr\fR]
[\fB\-s\fR \fIN\fR] [\fB\-theme\fR \fIname\fR] [\fB\-bg\fR \fIcolor\fR]
[\fB\-fg\fR \fIcolor\fR] [\fB\-frame\fR \fIcolor\fR] [\fB\-inact\fR
\fIcolor\fR] [\fB\-bc\fR \fIcolor\fR] [\fB\-bw\fR \fIN\fR] [\fB\-font\fR
\fIname\fR] [\fB\-vertical\fR] [\fB\-e\fR] [\fB\-b\fR \fIN\fR]
[\fB\-v\fR|\fB\-vv\fR]
+\fBalttab\fR [\fB\-w\fR \fIN\fR] [\fB\-d\fR \fIN\fR] [\fB\-sc\fR \fIN\fR]
[\fB\-mk\fR \fIstr\fR] [\fB\-kk\fR \fIstr\fR] [\fB\-bk\fR \fIstr\fR]
[\fB\-pk\fR \fIstr\fR] [\fB\-nk\fR \fIstr\fR] [\fB\-ck\fR \fIstr\fR]
[\fB\-dk\fR \fIstr\fR] [\fB\-mm\fR \fIN\fR] [\fB\-bm\fR \fIN\fR] [\fB\-t\fR
\fINxM\fR] [\fB\-i\fR \fINxM\fR] [\fB\-vp\fR \fIstr\fR] [\fB\-p\fR \fIstr\fR]
[\fB\-s\fR \fIN\fR] [\fB\-theme\fR \fIname\fR] [\fB\-bg\fR \fIcolor\fR]
[\fB\-fg\fR \fIcolor\fR] [\fB\-frame\fR \fIcolor\fR] [\fB\-inact\fR
\fIcolor\fR] [\fB\-bc\fR \fIcolor\fR] [\fB\-bw\fR \fIN\fR] [\fB\-font\fR
\fIname\fR] [\fB\-vertical\fR] [\fB\-e\fR] [\fB\-b\fR \fIN\fR] [\fB\-ns\fR]
[\fB\-v\fR|\fB\-vv\fR]
.SH "DESCRIPTION"
The task switcher designed for minimalistic window managers or standalone X11
session\.
.P
@@ -31,7 +31,7 @@
.IP
\fI2\fR: Ratpoison\.
.IP
-Alttab uses ratpoison own remote control capability\. Additionally, alttab
registers itself in its "unmanaged list" automatically\.
+Alttab uses ratpoison own remote control capability\. Also, alttab registers
itself in its "unmanaged list" automatically\.
.IP
\fI3\fR: Ancient WM\.
.IP
@@ -76,7 +76,7 @@
\fB\-mk\fR \fIstr\fR
resource: alttab\.modifier\.keysym
.br
-default: Alt_L
+default: Alt_L (i\.e\. Left Alt)
.IP
Keysym of main modifier\. String or number accepted\. Suitable examples:
Control_L, Super_L\.
.TP
@@ -153,7 +153,7 @@
.IP
Limit viewport for the switcher\. The switcher always has variable size and
position, but tries to never break out of \fB\-vp\fR container, while \fB\-p\fR
specifies position relative to this container\. Together these options allow
for WM\-independent multi\-monitor support\. Possible values for \fB\-vp\fR:
.IP
-\fIfocus\fR: in multihead configuration: the monitor which shows largest part
of currently focused window\. If this part is shared with other monitors, then
the smallest of these monitors is choosen\. In single head configuration: the
geometry of default root window\.
+\fIfocus\fR: in multihead configuration: the monitor which shows largest part
of currently focused window\. If this part is shared with other monitors, then
the smallest of these monitors is chosen\. In single head configuration: the
geometry of default root window\.
.IP
\fIpointer\fR: the monitor which has mouse pointer, otherwise the same as
\fIfocus\fR\.
.IP
@@ -294,11 +294,20 @@
.br
default: \fI0\fR in single\-desktop mode, \fI1\fR otherwise
.IP
-Content of auxiliary line at the bottom of each tile\. \fINUMBER\fR must be 0
or 1:
+Content of auxiliary line at the bottom of each tile\. \fINUMBER\fR must be
between 0 and 2:
.IP
\fI0\fR: Empty\.
.IP
\fI1\fR: Desktop to which the window belongs\.
+.IP
+\fI2\fR: User name\. Requires _NET_WM_PID freedesktop property and /proc file
system\.
+.TP
+\fB\-ns\fR
+resource: alttab\.noskiptaskbar
+.br
+default: no
+.IP
+Ignore application request of not including a window on a taskbar\.
.TP
\fB\-v\fR, \fB\-vv\fR
resource: no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/doc/alttab.1.ronn
new/alttab-1.7.1/doc/alttab.1.ronn
--- old/alttab-1.7.0/doc/alttab.1.ronn 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/doc/alttab.1.ronn 2023-04-29 17:23:23.000000000 +0200
@@ -16,7 +16,7 @@
## SYNOPSIS
-`alttab` [`-w` <N>] [`-d` <N>] [`-sc` <N>] [`-mk` <str>] [`-kk` <str>] [`-bk`
<str>] [`-pk` <str>] [`-nk` <str>] [`-ck` <str>] [`-dk` <str>] [`-mm` <N>]
[`-bm` <N>] [`-t` <NxM>] [`-i` <NxM>] [`-vp` <str>] [`-p` <str>] [`-s` <N>]
[`-theme` <name>] [`-bg` <color>] [`-fg` <color>] [`-frame` <color>] [`-inact`
<color>] [`-bc` <color>] [`-bw` <N>] [`-font` <name>] [`-vertical`] [`-e`]
[`-b` <N>] [`-v`\|`-vv`]
+`alttab` [`-w` <N>] [`-d` <N>] [`-sc` <N>] [`-mk` <str>] [`-kk` <str>] [`-bk`
<str>] [`-pk` <str>] [`-nk` <str>] [`-ck` <str>] [`-dk` <str>] [`-mm` <N>]
[`-bm` <N>] [`-t` <NxM>] [`-i` <NxM>] [`-vp` <str>] [`-p` <str>] [`-s` <N>]
[`-theme` <name>] [`-bg` <color>] [`-fg` <color>] [`-frame` <color>] [`-inact`
<color>] [`-bc` <color>] [`-bw` <N>] [`-font` <name>] [`-vertical`] [`-e`]
[`-b` <N>] [`-ns`] [`-v`\|`-vv`]
## DESCRIPTION
@@ -57,7 +57,7 @@
<2>: Ratpoison.
- Alttab uses ratpoison own remote control capability. Additionally,
alttab registers itself in its "unmanaged list" automatically.
+ Alttab uses ratpoison own remote control capability. Also, alttab
registers itself in its "unmanaged list" automatically.
<3>: Ancient WM.
@@ -104,7 +104,7 @@
* `-mk` <str>:
resource: alttab.modifier.keysym
- default: Alt_L
+ default: Alt_L (i.e. Left Alt)
Keysym of main modifier. String or number accepted.
Suitable examples: Control_L, Super_L.
@@ -183,7 +183,7 @@
<focus>: in multihead configuration: the monitor which shows
largest part of currently focused window. If this part is shared
- with other monitors, then the smallest of these monitors is choosen.
+ with other monitors, then the smallest of these monitors is chosen.
In single head configuration: the geometry of default root window.
<pointer>: the monitor which has mouse pointer, otherwise
@@ -322,12 +322,20 @@
default: <0> in single-desktop mode, <1> otherwise
Content of auxiliary line at the bottom of each tile.
- <NUMBER> must be 0 or 1:
+ <NUMBER> must be between 0 and 2:
<0>: Empty.
<1>: Desktop to which the window belongs.
+ <2>: User name. Requires _NET_WM_PID freedesktop property and /proc file
system.
+
+ * `-ns`:
+ resource: alttab.noskiptaskbar
+ default: no
+
+ Ignore application request of not including a window on a taskbar.
+
* `-v`, `-vv`:
resource: no
default: silent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/doc/alttab.ad
new/alttab-1.7.1/doc/alttab.ad
--- old/alttab-1.7.0/doc/alttab.ad 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/doc/alttab.ad 2023-04-29 17:23:23.000000000 +0200
@@ -90,3 +90,5 @@
! Force showing desktop number at the bottom of each tile
!alttab.bottomline: 1
+! Ignore _NET_WM_STATE_SKIP_TASKBAR
+!alttab.noskiptaskbar: true
Binary files old/alttab-1.7.0/doc/screenshots/alttab-github-social-preview.png
and new/alttab-1.7.1/doc/screenshots/alttab-github-social-preview.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/doc/wm-setup.md
new/alttab-1.7.1/doc/wm-setup.md
--- old/alttab-1.7.0/doc/wm-setup.md 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/doc/wm-setup.md 2023-04-29 17:23:23.000000000 +0200
@@ -74,7 +74,7 @@
====
### keyboard shortcut
-Applications -> Settings -> Settings Editor (not Manager) -> Channel:
xfce4-keyboard-shortcuts -> in rigth pane disable all entries of
`cycle_windows_key` or `cycle_reverse_windows_key`.
+Applications -> Settings -> Settings Editor (not Manager) -> Channel:
xfce4-keyboard-shortcuts -> in right pane disable all entries of
`cycle_windows_key` or `cycle_reverse_windows_key`.
### startup
Applications -> Settings -> Session and Startup -> Application Autostart -> Add
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/src/alttab.c
new/alttab-1.7.1/src/alttab.c
--- old/alttab-1.7.0/src/alttab.c 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/src/alttab.c 2023-04-29 17:23:23.000000000 +0200
@@ -76,7 +76,8 @@
-font name font name in the form xft:fontconfig_pattern\n\
-vertical verticat layout\n\
-e keep switcher after keys release\n\
- -b N bottom line: 0=no, 1=desktop\n\
+ -b N bottom line: 0=no, 1=desktop, 2=user\n\
+ -ns ignore window request to skip it in taskbar\n\
-v|-vv verbose\n\
-h help\n\
See man alttab for details.\n", PACKAGE_VERSION);
@@ -84,7 +85,7 @@
}
//
-// initialize globals based on executable agruments and Xresources
+// initialize globals based on executable arguments and Xresources
// return 1 if success, 0 otherwise
// on fatal failure, calls die/exit
//
@@ -136,7 +137,8 @@
{"-font", "*font", XrmoptionSepArg, NULL},
{"-vertical", "*vertical", XrmoptionIsArg, NULL},
{"-e", "*keep", XrmoptionIsArg, NULL},
- {"-b", "*bottomline", XrmoptionSepArg, NULL}
+ {"-b", "*bottomline", XrmoptionSepArg, NULL},
+ {"-ns", "*noskiptaskbar", XrmoptionIsArg, NULL}
};
const char *inv = "invalid %s, use -h for help\n";
const char *rmb = "can't figure out modmask from keycode 0x%x\n";
@@ -518,6 +520,10 @@
}
msg(0, "bottomline: %d\n", g.option_bottom_line);
+ s = xresource_load_string(&db, XRMAPPNAME, "noskiptaskbar");
+ g.option_no_skip_taskbar = (s != NULL);
+ msg(0, "no_skip_taskbar: %d\n", g.option_no_skip_taskbar);
+
return 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/src/alttab.h
new/alttab-1.7.1/src/alttab.h
--- old/alttab-1.7.0/src/alttab.h 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/src/alttab.h 2023-04-29 17:23:23.000000000 +0200
@@ -195,8 +195,10 @@
#define BL_MIN 0
#define BL_NONE 0
#define BL_DESKTOP 1
-#define BL_MAX 1
+#define BL_USER 2
+#define BL_MAX 2
int option_bottom_line;
+ bool option_no_skip_taskbar;
Color color[NCOLORS];
GC gcDirect, gcReverse, gcFrame; // used in both gui.c and win.c
unsigned int ignored_modmask;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/src/ewmh.c new/alttab-1.7.1/src/ewmh.c
--- old/alttab-1.7.0/src/ewmh.c 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/src/ewmh.c 2023-04-29 17:23:23.000000000 +0200
@@ -319,6 +319,8 @@
int i;
bool ret = false;
+ if (g.option_no_skip_taskbar)
+ return false;
state =
(Atom *) get_x_property(w, XA_ATOM, "_NET_WM_STATE", &state_propsize);
if (state == NULL || state_propsize == 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/src/gui.c new/alttab-1.7.1/src/gui.c
--- old/alttab-1.7.0/src/gui.c 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/src/gui.c 2023-04-29 17:23:23.000000000 +0200
@@ -263,7 +263,7 @@
endBottomLine:
// draw label
- if (wi->name && fontLabel) {
+ if (wi->name[0] && fontLabel) {
int x, y, w, h;
if (g.option_vertical) {
x = iconW + 5;
@@ -445,7 +445,7 @@
scrdim.w = DisplayWidth(dpy, scr);
scrdim.h = DisplayHeight(dpy, scr);
}
-// caculate viewport.
+// calculate viewport.
#define VPM g.option_vp_mode
switch (VPM) {
case VP_SPECIFIC:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/src/randr.c new/alttab-1.7.1/src/randr.c
--- old/alttab-1.7.0/src/randr.c 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/src/randr.c 2023-04-29 17:23:23.000000000 +0200
@@ -249,7 +249,7 @@
return true;
}
// if best cross-area is shared with some other monitor,
- // then smallest of these monitors is choosen.
+ // then smallest of these monitors is chosen.
smallest_2_stage_area =
oq[best_1_stage_output].w * oq[best_1_stage_output].h;
for (o = 0; o < no; o++) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alttab-1.7.0/src/win.c new/alttab-1.7.1/src/win.c
--- old/alttab-1.7.0/src/win.c 2023-03-08 15:45:56.000000000 +0100
+++ new/alttab-1.7.1/src/win.c 2023-04-29 17:23:23.000000000 +0200
@@ -22,6 +22,9 @@
#include <X11/Xutil.h>
#include <X11/Xft/Xft.h>
#include <X11/Xatom.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <pwd.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@ -486,6 +489,11 @@
// 4. bottom line
WI.bottom_line[0] = '\0';
+ long unsigned int nws, *pid;
+ char procd[32];
+ int sr;
+ struct stat st;
+ struct passwd *gu;
switch(g.option_bottom_line) {
case BL_DESKTOP:
if (desktop != DESKTOP_UNKNOWN)
@@ -493,6 +501,26 @@
else
strncpy(WI.bottom_line, "?", 2);
break;
+ case BL_USER:
+ pid = (long unsigned int*)get_x_property(WI.id,
+ XA_CARDINAL, "_NET_WM_PID", &nws);
+ if (!pid) {
+ strncpy(WI.bottom_line, "[no pid]", 9);
+ break;
+ }
+ snprintf(procd, 32, "/proc/%ld", *pid);
+ sr = stat(procd, &st);
+ if (sr == -1) {
+ strncpy(WI.bottom_line, "[no /proc]", 11);
+ break;
+ }
+ gu = getpwuid(st.st_uid);
+ if (gu == NULL) {
+ strncpy(WI.bottom_line, "[no name]", 10);
+ break;
+ }
+ snprintf(WI.bottom_line, MAXNAMESZ, "%s", gu->pw_name);
+ break;
}
// 5. other window data
@@ -669,10 +697,10 @@
if (usec_delta < 5E5) { // half a second
return;
}
- msg(0, PREF"pulling 'prev' 0x%lx supressed\n", aw);
+ msg(0, PREF"pulling 'prev' 0x%lx suppressed\n", aw);
}
if (aw == g.last.to) {
- msg(0, PREF"pulling 'to' 0x%lx supressed\n", aw);
+ msg(0, PREF"pulling 'to' 0x%lx suppressed\n", aw);
return;
}
*/
