Accepting request 857752 from home:glaubitz:branches:X11:windowmanagers

- Update to 2.0.0
  * Remove support for the old and obsolete _WIN_PROTOCOL properties.
  * Add support for the Imlib2 image rendering engine as an alternative
    for the gdk-pixbuf-xlib rendering engine. The Imlib2 image rendering
    engine is now the default, but this can be set at configure time.
  * Center the window list window if it got offscreen.
  * Fix horizontal scrolling in icehelp.
  * Use _NET_WM_STATE_HIDDEN instead of IconicState for minimize in icesh.
  * Icewm now supports ICCCM icon_pixmap and icon_window.
  * Don't unroll rolled up windows on left button press for issue #525.
  * Fix for drawing title pixmaps when they are gradients for issue #523.
  * Remove unwanted separator in taskbar for empty toolbar for issue #524.
    support BR_Portuguese language in 2 desktop files for issue #522.
  * Add support for WM_HINTS icon_window in MiniIcons.
  * Check if WM_HINTS update actually changes anything.
  * Don't attempt to draw Unicode in non-UTF-8 environment for issue #519
  * Icewm now supports the icon_pixmaps from WM_HINTS to correctly
    show the icon for NEdit, xmgrace, xv, timidity and fontforge.
  * Don't resize when trying to move when dragging at y=0 for issue #520.
  * Report errors if enabled packages are missing for issue #516.
  * Instead of render.h include Xrender.h for dependency checking for issue #516.
  * Fix the positioning of the window list title for non-standard SmallIconSize
    settings for issue #514.
- from version 1.9.2
  * Fix for correctly restoring xterm from fullscreen in issue #28.
  * Prevent inadvertent growing of windows in issue #512.
- from version 1.9.1
  * Fix for NEdit, which delays setting WM_NORMAL_HINTS, to fix issue #510.
  * Fix for changing layers when ABOVE or BELOW bit is set.
  * Use a minimum delay of 10 ms for auto taskbar delays for issue #508.

OBS-URL: https://build.opensuse.org/request/show/857752
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=111
This commit is contained in:
İsmail Dönmez 2020-12-29 09:06:57 +00:00 committed by Git OBS Bridge
parent 80ea3b00a9
commit a0e922a5da
7 changed files with 258 additions and 61 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d41e6abf842ff3f8705a81d352be7c5b181c587549c183de0641c3820234a7b2
size 1681783

3
icewm-2.0.0.tar.lz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4478172b936f7f7dcfc2120be8d8f153fd755933bf98b8e98e3eae50c414939c
size 1694653

View File

@ -1,8 +1,8 @@
diff --git a/lib/icewm.desktop b/lib/icewm.desktop
index d6e5a04..02618b5 100644
--- a/lib/icewm.desktop
+++ b/lib/icewm.desktop
@@ -11,7 +11,7 @@ Comment[da]=Simpel og hurtig vindueshåndtering
Index: icewm-2.0.0/lib/icewm.desktop
===================================================================
--- icewm-2.0.0.orig/lib/icewm.desktop
+++ icewm-2.0.0/lib/icewm.desktop
@@ -18,7 +18,7 @@ GenericName[pt_BR]=Gerencidador simples
Icon=icewm
TryExec=/usr/bin/icewm
Exec=icewm

View File

@ -14,56 +14,53 @@ a file generated by ./src/genpref. To edit the patch:
vi lib/preferences
quilt refresh
---
diff --git a/src/preferences b/src/preferences
index dbf965e..94d8053 100644
Index: b/src/preferences
===================================================================
--- a/src/preferences
+++ b/src/preferences
@@ -555,6 +555,7 @@
@@ -576,6 +576,7 @@
# Icon search path (colon separated)
# IconPath="/usr/share/icons/oxygen/base:/usr/share/icons/Adwaita:/usr/share/icons/hicolor:/usr/share/icons:/usr/share/pixmaps:/usr/local/share/icons/hicolor:"
# IconPath="/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/icons:/usr/share/pixmaps:"
+IconPath="/usr/share/icons/Adwaita/16x16/legacy:/usr/share/icons/Adwaita/16x16/apps:/usr/share/icons/hicolor:/usr/share/icons:/usr/share/pixmaps"
# Mailbox path (use $MAIL instead)
# MailBoxPath=""
@@ -569,7 +570,7 @@
# NewMailCommand=""
# Colon separated icon theme list with wildcard support. Minus prefix - can be used to exclude themes.
# IconThemes="*:-HighContrast"
@@ -594,6 +595,7 @@
# Command to lock display/screensaver
-# LockCommand=""
# LockCommand=""
+LockCommand="xlock -mousemotion"
# Command to run on clock
# ClockCommand="xclock -name icewm -title Clock"
@@ -592,10 +593,10 @@
# LogoutCancelCommand=""
@@ -617,9 +619,11 @@
# Command to shutdown the system
-# ShutdownCommand="test -e /run/systemd/system && systemctl poweroff"
# ShutdownCommand="test -e /run/systemd/system && systemctl poweroff"
+ShutdownCommand="/bin/sh -c 'systemctl poweroff ||:'"
# Command to reboot the system
-# RebootCommand="test -e /run/systemd/system && systemctl reboot"
# RebootCommand="test -e /run/systemd/system && systemctl reboot"
+RebootCommand="/bin/sh -c 'systemctl reboot ||:'"
# Command to send the system to standby mode
# SuspendCommand="test -e /run/systemd/system && systemctl suspend"
@@ -1323,16 +1324,16 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4 "
# DesktopBackgroundMultihead=0 # 0/1
@@ -1353,15 +1357,18 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
# Display desktop background centered and not tiled
-# DesktopBackgroundCenter=0 # 0/1
# DesktopBackgroundCenter=0 # 0/1
+DesktopBackgroundCenter=0 # 0/1
# Support for semitransparent terminals like Eterm or gnome-terminal
# SupportSemitransparency=1 # 0/1
# Resize desktop background to full screen
-# DesktopBackgroundScaled=0 # 0/1
# DesktopBackgroundScaled=0 # 0/1
+DesktopBackgroundScaled=1 # 0/1
# Desktop background image(s)
-# DesktopBackgroundImage=""
# DesktopBackgroundImage=""
+DesktopBackgroundImage="BRANDING_PICTURE"
# Desktop background color(s)

View File

@ -1,8 +1,7 @@
diff --git a/lib/menu.in b/lib/menu.in
index f200514..3118471 100644
--- a/lib/menu.in
+++ b/lib/menu.in
@@ -12,5 +12,6 @@ prog Firefox mozilla firefox
diff -Nru icewm-2.0.0.orig/lib/menu.in icewm-2.0.0/lib/menu.in
--- icewm-2.0.0.orig/lib/menu.in 2020-12-14 02:14:27.000000000 +0100
+++ icewm-2.0.0/lib/menu.in 2020-12-20 18:55:09.026453502 +0100
@@ -11,5 +11,6 @@
prog Hexchat xchat hexchat
prog Gimp gimp gimp
includeprog icewm-menu-fdo --sep-before --no-sep-others
@ -10,11 +9,10 @@ index f200514..3118471 100644
+#menufile Programs folder programs
menufile Tool_bar folder toolbar
+menuprog SUSE folder xdg_menu --format icewm
diff --git a/src/wmmenu.cc b/src/wmmenu.cc
index ccee25e..ec2ff81 100644
--- a/src/wmmenu.cc
+++ b/src/wmmenu.cc
@@ -297,6 +297,45 @@ char* MenuLoader::parseMenuProg(char *p, ObjectContainer *container)
diff -Nru icewm-2.0.0.orig/src/wmmenu.cc icewm-2.0.0/src/wmmenu.cc
--- icewm-2.0.0.orig/src/wmmenu.cc 2020-12-14 02:14:27.000000000 +0100
+++ icewm-2.0.0/src/wmmenu.cc 2020-12-20 18:59:54.401885022 +0100
@@ -294,6 +294,46 @@
return p;
}
@ -23,19 +21,19 @@ index ccee25e..ec2ff81 100644
+ Argument name;
+
+ p = YConfig::getArgument(&name, p);
+ if (p == 0) return p;
+ if (p == nullptr) return p;
+
+ Argument icons;
+
+ p = YConfig::getArgument(&icons, p);
+ if (p == 0) return p;
+ if (p == nullptr) return p;
+
+ Argument command;
+ YStringArray args;
+
+ p = getCommandArgs(p, &command, args);
+ if (p == 0) {
+ msg(_("Error at prog %s"), name.cstr());
+ if (p == nullptr) {
+ msg(_("Error at menuprog '%s'"), name.cstr());
+ return p;
+ }
+
@ -46,21 +44,22 @@ index ccee25e..ec2ff81 100644
+#endif
+ MSG(("suseprog %s %s", name.cstr(), command.cstr()));
+
+ upath fullPath = findPath(getenv("PATH"), X_OK, command.cstr());
+ if (fullPath != null) {
+ csmart path(path_lookup(command.cstr()));
+ if (path) {
+ ObjectMenu *progmenu = new MenuProgMenu(
+ app, smActionListener, wmActionListener,
+ name.cstr(), command.cstr(), args, 0);
+ name.cstr(), command.cstr(), args);
+ if (progmenu)
+ container->addContainer(name.cstr(), icon, progmenu);
+ }
+ container->addContainer(name.cstr(), icon, progmenu);
+ }
+
+ return p;
+}
+
char* MenuLoader::parseMenuProgReload(char *p, ObjectContainer *container)
{
Argument name;
@@ -398,6 +437,9 @@ char* MenuLoader::parseWord(char *word, char *p, ObjectContainer *container)
@@ -395,6 +435,9 @@
else if (!strcmp(word, "menuprogreload")) {
p = parseMenuProgReload(p, container);
}
@ -70,20 +69,14 @@ index ccee25e..ec2ff81 100644
else if (!strcmp(word, "include")) {
p = parseIncludeStatement(p, container);
}
diff --git a/src/wmprog.h b/src/wmprog.h
index 4e9bd1f..d5b9827 100644
--- a/src/wmprog.h
+++ b/src/wmprog.h
@@ -31,10 +31,12 @@ private:
diff -Nru icewm-2.0.0.orig/src/wmprog.h icewm-2.0.0/src/wmprog.h
--- icewm-2.0.0.orig/src/wmprog.h 2020-12-14 02:14:27.000000000 +0100
+++ icewm-2.0.0/src/wmprog.h 2020-12-20 19:01:08.201727478 +0100
@@ -30,6 +30,7 @@
char* parseAMenu(char *data, ObjectContainer *container);
char* parseMenuFile(char *data, ObjectContainer *container);
char* parseMenuProg(char *data, ObjectContainer *container);
char* parseMenuProgReload(char *data, ObjectContainer *container);
+ char* parseSuseProg(char *p, ObjectContainer *container);
char* parseMenuProgReload(char *data, ObjectContainer *container);
char* parseKey(char *word, char *p);
char* parseProgram(char *word, char *p, ObjectContainer *container);
char* parseWord(char *word, char *p, ObjectContainer *container);
+
IApp *app;
YSMListener *smActionListener;
YActionListener *wmActionListener;

View File

@ -1,3 +1,209 @@
-------------------------------------------------------------------
Sun Dec 20 18:23:34 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.0.0
* Remove support for the old and obsolete _WIN_PROTOCOL properties.
* Add support for the Imlib2 image rendering engine as an alternative
for the gdk-pixbuf-xlib rendering engine. The Imlib2 image rendering
engine is now the default, but this can be set at configure time.
* Center the window list window if it got offscreen.
* Fix horizontal scrolling in icehelp.
* Use _NET_WM_STATE_HIDDEN instead of IconicState for minimize in icesh.
* Icewm now supports ICCCM icon_pixmap and icon_window.
* Don't unroll rolled up windows on left button press for issue #525.
* Fix for drawing title pixmaps when they are gradients for issue #523.
* Remove unwanted separator in taskbar for empty toolbar for issue #524.
support BR_Portuguese language in 2 desktop files for issue #522.
* Add support for WM_HINTS icon_window in MiniIcons.
* Check if WM_HINTS update actually changes anything.
* Don't attempt to draw Unicode in non-UTF-8 environment for issue #519
* Icewm now supports the icon_pixmaps from WM_HINTS to correctly
show the icon for NEdit, xmgrace, xv, timidity and fontforge.
* Don't resize when trying to move when dragging at y=0 for issue #520.
* Report errors if enabled packages are missing for issue #516.
* Instead of render.h include Xrender.h for dependency checking for issue #516.
* Fix the positioning of the window list title for non-standard SmallIconSize
settings for issue #514.
- from version 1.9.2
* Fix for correctly restoring xterm from fullscreen in issue #28.
* Prevent inadvertent growing of windows in issue #512.
- from version 1.9.1
* Fix for NEdit, which delays setting WM_NORMAL_HINTS, to fix issue #510.
* Fix for changing layers when ABOVE or BELOW bit is set.
* Use a minimum delay of 10 ms for auto taskbar delays for issue #508.
* Note in preferences which timing delays are in milliseconds.
* Ignore applications with _NET_WM_STATE_SKIP_PAGER set in PagerShowPreview.
* Update XDND protocol version from 3 to 5.
- from version 1.9.0
* Properly handle name lookup failure for mailboxes for issue #493.
* Add --valgrind and --catchsegv options to icewm-session to support debugging.
* Add support for _NET_WM_WINDOW_TYPE to icesh.
* Always send one synthetic ConfigureNotify on initial window map for issue #492.
* Remove resize indicators from the frame window when unneeded.
* Reduce the number of redraws in title bar.
* Support incomplete _MOTIF_WM_HINTS property for mlterm.
* Add missing getProtocols to message dialog to fix issue #494.
* Drop support for ISDN network devices in the network monitor.
* Update the Catalan, Japanese, Portugeuese, Slovak translations.
* Update the Czech, Dutch, Indonesian, and Hindi translations.
* Optimizations to handling of Motif hints to avoid unneeded resizing.
* Several fixes for correct PagerShowPreview updates for #496.
* Fix desktop mini icon positioning for fullscreen windows.
* Don't activate a fullscreen window on startup when it is unmapped.
* Fixes for TaskBarAutoHide.
* Improve drawing of ellipsis in titles.
* Optimize the loading of configuration files.
* Workaround for non-standard behavior of xnec2c in issue #503.
* When fullscreen then record resize requests for later restoration.
* Allow width_inc and height_inc to be zero to disable maximization.
* Fix handling of WM_CLIENT_LEADER property for Motif applications in #506.
- from version 1.8.3
* Check if filedescriptor is valid and fix off-by-one allocation error.
* When icewm starts, reduce the number of workarea updates for taskbar to one.
* The taskbar only has struts if it is exactly at the top or bottom of the screen.
* Fix for autohide taskbar not wanting to hide.
* Support TaskBarAutoHide for TaskBarKeepBelow.
* Postpone taskbar app status updates until idle, for faster event response.
* Don't send synthetic ConfigureNotify events for resizing unless required.
* Do send synthetic ConfigureNotify events for positioning when required.
* Only send window position updates to the client if it really has moved.
* Send at most one synthetic ConfigureNotify message per resize.
* Add proper support for EWMH _NET_RESTACK_WINDOW requests to raise a window.
* Reflect layer changes in the _NET_WM_STATE ABOVE and BELOW flags.
* Add WinStateFullscreen to the visible _WIN_STATE bits.
* Make switch icons opaque for 32-bit visuals.
* Fix for "icesh -last".
* Fix issue bbidulock/icewm#491 for F11 fullscreen key on GTK terminals.
* Support "icesh toggleState Fullscreen"
* Support icesh "iconic" and "normal" commands for WM_CHANGE_STATE.
* Use wmHide or wmShow to hide or show the taskbar to fix issue bbidulock/icewm#489.
- from version 1.8.2
* Fixes for using the proper icon sizes for issue #483.
* Fixes for reading from pipes in "menuprog" and "menuprogreload" for issue #487.
* CMake support was extended to the FreeBSD, OpenBSD and Solaris platforms.
* In "menuprog" and "menuprogreload" do dollar expansion and tilde expansion.
* New Portuguese (pt) translations.
- from version 1.8.1
* Fix path_lookup strtok_r for non-Glibc BSD systems for #23.
* Fix topSideVerticalOffset for fully opaque frame borders for #482.
* Fix the FreeBSD case where icewm-session is started
* in the root directory by the display manager.
* Prevent premature workarea changes when collapsing
* taskbar to avoid repositioning MiniIcons.
* Fix the default KeySysArrangeIcons key binding to Alt+Shift+F8.
* Only define KeySysArrangeIcons if preference MinimizeToDesktop=1.
* Add KeyWinSmartPlace to preferences.
* Remove undocumented KeyWinSnapMove.
* Portability changes for OpenBSD.
* Prevent cyclic dependencies for transient windows.
* Also let icesh spy on ClientMessages.
- from version 1.8.0
* Let workspacebutton use the workspace button fonts when drawing text.
* Don't switch focus on a FocusOut event on the root window.
* Prevent the pingponging of focus between windows when one window loses focus.
* Improved support of applications with transient windows.
* In the window list window, improve the Show command to
consider work area and screen boundaries.
* Give message buttons some padding and a minimum size.
* Fix the saving of modified options to preferences.
* Fix opacity in titlebar and task buttons when using gradients.
* Fix status of logout entry in the logout menu.
* New theme option MenuButtonIconVertOffset to adjust the position
of the menu button icon in case ShowMenuButtonIcon=1.
* Improved ICCCM conformance for restack requests of transient windows.
* Several improvements to the CrystalBlue theme.
* Update theme NanoBlue.
* Change xterm.icon into xterm.XTerm.icon in the default winoptions.
* More beautiful MiniIcons show just a large shaped icon if MinimizeToDesktop=1.
* Improved positioning of MiniIcons when the work area grows or shrinks.
* Enable Arrange Icons in taskbar menu to rearrange all desktop MiniIcons.
* Add a tooltip to MiniIcons which reflects the window title.
* Enable dragging MiniIcons with the left mouse button.
* Ensure icons of irregular sizes are always scaled or loaded.
* Fix the --logevents option.
* Update the frame status in the move menu and the layer menu before showing them.
* Improved Chinese translation by WhiredPlanck.
* Rename comments from APM monitor to battery monitor by DieSpinne.
* Efficiency improvements to the relocation of frames when the workarea changes.
* Better positioning of collapse button to avoid a white line at the bottom of the taskbar.
* A completely rewritten icon locator by Eduard Bloch which finds many more icons.
* A new option IconThemes by Eduard Bloch to set your icon theme preferences.
* Handle more detail in configure request messages.
* Avoid focusing a random client when a request to stack a client below is received.
* Update _NET_CLIENT_LIST_STACKING on a configure request to restack a window.
* Detect when the top side of the title bar border is partially
transparent for improved positioning.
* More updated translations.
* Exclude the collapsed taskbar button from workarea calculations.
* Update workspace buttons when workspace names change.
* Show a sticky window just once on all PagerShowPreview workspace buttons.
* Make button hover work after a click-cancel for issue #448.
* Fix for correctly computing the X shape mask of shaped titlebars.
* Fix for updating titlebar shape when title changes.
* Prevent the delayed focus timer or autoraise timer from interfering
when a frame is minimized, iconified or rolled up.
* Don't set the _NET_WM_STATE_FOCUSED flag when mimimized, hidden or rolledup.
* Set the WM_ICON_SIZE root window property according to theme icon sizes.
* Add sys/resource.h include for FreeBSD for issue #445.
* Add definition of ACPIDEV to fix compilation for FreeBSD.
- from version 1.7.0
* New preference KeyboardLayouts for switching of keyboards layouts.
* Fix move menu and layer menu for selections in window list window.
* Don't take away focus from an application when icewm exits.
* On startup check _NET_ACTIVE_WINDOW and use it to preserve focus over restarts.
* Set _NET_ACTIVE_WINDOW to None when no window has focus.
* Better restore focus to window in Above layer when some other window closes.
* New winoption ignoreActivationMessages to ignore programmatic focus requests.
* Fix for taskBarWidthPercentage in case screen is not at (0, 0).
* Use wordexp to avoid a /bin/sh.
* Fix #21 "Problem with dosbox and re-maximize the screen".
* Add Maximize Horizontal to window list window.
* Refresh frames and buttons after screen resize to prevent artefacts.
* Add detailed tracing of systray activity.
* Slightly better conformance to XEMBED standard.
* Reorder systray operations for better test results.
* Only refocus in setWorkspace if workspace really changes.
* Reset workspace focused frame if focused frame changes workspace.
* Fix for negative geometry positions in winoptions.
* Fix icesh runonce.
* Fix for icewm --replace.
* Fix icewm hint processing and make icewmhint geometry work.
* Let icehelp be quiet when parsing html.
* Update theme NanoBlue from Nano_Blu-1.3 to evade a bug in Glamor.
- from version 1.6.6
* Permit deleting entire input line in address bar.
* Fix for TaskBarShowWindows=0 if TaskBarAutoHide=1 for issue #434.
* Accept requests for clipboard selection as UTF-8.
* Request selection as UTF-8 string in addressbar.
* Add support for setting icewm options in env for icewm-session.
* New option PagerShowLabels for issue #19.
* Prevent possible division by zero when calculating battery capacity.
* Make CPU temperature centered.
* Fix to make window list icons fit their rows in issue #433.
* Fix scaled icons in menu for issue #429
* Fix for systray background filling in issue #430.
* Fix for CPUStatusShowAcpiTempInGraph=1 in issue #431.
* Make title buttons behave the same as title bar for Button2.
* Pass mouse presses on object buttons on to the taskbar for issue #424.
* Add new -xembed selector for icesh in issue #423.
* Fix for icesh -window.
* Add icewm-session --output=FILE option.
* Repaint frame border immediately for issue #417.
* Fix TaskBarAutoHide for TaskBarDoubleHeight for issue #415.
* Port to Solaris.
* Slightly larger tray app icons.
* Limit resize band to 3 pixels wide.
* Better support for RGBA colors.
* Add support for urxvt -borderless.
* Fuzzy matching of desktop categories for icewm-menu-fdo.
* A number of updated translations.
- Add pkgconfig(imlib2) to BuildRequires
- Fix file pattern for manpages in %files section
- Refresh patches for new version
- icewm-desktop-nodisplay.patch
- icewm-preferences.patch
- icewm-susemenu.patch
-------------------------------------------------------------------
Sat May 16 12:10:39 UTC 2020 - Namor Barcode <z1trus@gmx.com>

View File

@ -18,7 +18,7 @@
%global lites icewm icewmhint icewmbg icesh icewm-session
Name: icewm
Version: 1.6.5
Version: 2.0.0
Release: 0
Summary: Window Manager with a Taskbar
License: LGPL-2.1-or-later
@ -50,6 +50,7 @@ BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(fribidi)
BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(imlib2)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(x11)
@ -282,8 +283,8 @@ fi
%{_datadir}/xsessions/icewm-session.desktop
%{_datadir}/xsessions/icewm.desktop
%{_datadir}/xsessions/default.desktop
%{_mandir}/man1/
%{_mandir}/man5/
%{_mandir}/man1/*
%{_mandir}/man5/*
%files config-upstream
%dir %{_sysconfdir}/icewm/