1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
|
Description: Autogenerated patch header for a single-debian-patch file.
The delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.
Forwarded: not-needed
---
--- icewm-3.6.0.orig/lib/keys.in
icewm-3.6.0/lib/keys.in
@@ -26,8 26,8 @@ key "Super KP_Add" amixer sset
key "XF86AudioLowerVolume" amixer sset Master 5%-
key "XF86AudioRaiseVolume" amixer sset Master 5%
key "XF86AudioMute" amixer sset Master toggle
-key "XF86HomePage" xdg-open about:blank
-key "XF86Search" xdg-open https://www.google.com
key "XF86HomePage" sensible-browser about:blank
key "XF86Search" sensible-browser https://www.duckduckgo.com
key "XF86Eject" eject
key "XF86Calculator" /bin/sh -c "gnome-calculator || xcalc || ( type bc >/dev/null 2>&1 && @XTERMCMD@ -e bc -l)"
--- icewm-3.6.0.orig/lib/winoptions.in
icewm-3.6.0/lib/winoptions.in
@@ -5,6 5,8 @@
xterm.XTerm.icon: xterm
rxvt.icon: xterm
urxvtc.icon: urxvt
urxvt.icon: urxvt
nxterm.icon: xterm
emacs.Emacs.icon: emacs
--- icewm-3.6.0.orig/src/default.h
icewm-3.6.0/src/default.h
@@ -127,7 127,7 @@ XIV(bool, win95keys,
XIV(bool, autoReloadMenus, true)
XIV(bool, arrangeWindowsOnScreenSizeChange, true)
XIV(bool, clientMouseActions, true)
-XIV(bool, showPrograms, false)
XIV(bool, showPrograms, true)
XIV(bool, showSettingsMenu, true)
XIV(bool, showFocusModeMenu, true)
XIV(bool, showThemesMenu, true)
@@ -180,7 180,7 @@ XSV(const char *, mailBoxPath,
XSV(const char *, mailCommand, TERM " -name mutt -e mutt")
XSV(const char *, mailClassHint, "mutt.XTerm")
XSV(const char *, newMailCommand, 0)
-XSV(const char *, lockCommand, 0)
XSV(const char *, lockCommand, "xscreensaver-command -lock")
XSV(const char *, clockCommand, "xclock -name icewm -title Clock")
XSV(const char *, clockClassHint, "icewm.XClock")
XSV(const char *, runDlgCommand, 0)
@@ -189,10 189,10 @@ XSV(const char *, terminalCommand,
XSV(const char *, logoutCommand, 0)
XSV(const char *, logoutCancelCommand, 0)
#if __linux__
-XSV(const char *, shutdownCommand, "test -e /run/systemd/system && systemctl poweroff || loginctl poweroff")
-XSV(const char *, rebootCommand, "test -e /run/systemd/system && systemctl reboot || loginctl reboot")
-XSV(const char *, suspendCommand, "test -e /run/systemd/system && systemctl suspend || loginctl suspend")
-XSV(const char *, hibernateCommand, "test -e /run/systemd/system && systemctl hibernate || loginctl hibernate")
XSV(const char *, shutdownCommand, "test -e /run/systemd/system && systemctl poweroff || sudo -n /sbin/poweroff")
XSV(const char *, rebootCommand, "test -e /run/systemd/system && systemctl reboot || sudo -n /sbin/reboot")
XSV(const char *, suspendCommand, "test -e /run/systemd/system && systemctl suspend || sudo -n /usr/sbin/pm-suspend")
XSV(const char *, hibernateCommand, "test -e /run/systemd/system && systemctl hibernate || sudo -n /usr/sbin/pm-hibernate")
#elif __OpenBSD__ || __NetBSD__ || __FreeBSD__
XSV(const char *, shutdownCommand, "shutdown -p now")
XSV(const char *, rebootCommand, "shutdown -r now")
@@ -208,18 208,11 @@ XIV(int, taskBarCPUDelay,
XIV(int, taskBarMEMDelay, 500)
XIV(int, taskBarNetSamples, 20)
XIV(int, taskBarNetDelay, 500)
-XSV(const char *, cpuCommand, TERM " -name top -title Process\\ Status -e top")
XSV(const char *, cpuCommand, TERM " -T 'Process Status' -e top")
XSV(const char *, cpuClassHint, "top.XTerm")
XIV(bool, cpuCombine, true)
-
-#if __linux__
-XSV(const char *, netCommand, TERM " -name 'ss' -title 'Socket Statistics' -hold -e sh -c 'which ss > /dev/null && watch -t ss -putswl || netstat -c'")
XSV(const char *, netCommand, TERM " -T 'Network Status' -e /bin/sh /usr/share/icewm/netstat.sh")
XSV(const char *, netClassHint, "ss.XTerm")
-#else
-XSV(const char *, netCommand, TERM " -name netstat -title 'Network Status' -hold -e netstat -c")
-XSV(const char *, netClassHint, "netstat.XTerm")
-#endif
-
#if __OpenBSD__
#define NET_DEVICES "[ew]* vio*"
#else
--- icewm-3.6.0.orig/src/wmapp.cc
icewm-3.6.0/src/wmapp.cc
@@ -44,6 44,7 @@
char const *ApplicationName("IceWM");
RebootShutdown rebootOrShutdown = Logout;
static bool initializing(true);
void SetLiteDefaults();
YWMApp *wmapp;
YWindowManager *manager;
@@ -1316,6 1317,9 @@ YWMApp::YWMApp(int *argc, char ***argv,
focusMode(loadFocusMode()),
managerWindow(None)
{
if(argc && *argc>0 && argv && *argv && **argv && mstring(**argv).endsWith("-lite"))
SetLiteDefaults();
wmapp = this;
YIcon::iconResourceLocator = this;
@@ -2103,6 2107,14 @@ public:
}
};
void SetLiteDefaults()
{
showTaskBar = false;
fontPreferFreetype = false;
showWindowList = false;
quickSwitchAllIcons = false;
//addWorkspace(0, "1", false);
}
YWindow* YWMApp::splash(const char* splashFile) {
YWindow* window(nullptr);
if (splashFile && 4 < strlen(splashFile) && !post_preferences) {
|