diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/aclock.cc /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/aclock.cc --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/aclock.cc 2024-02-23 14:41:21.823053182 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/aclock.cc 2024-02-23 15:24:25.606810024 -0500 @@ -177,36 +177,13 @@ void YClock::handleClick(const XButtonEvent &up, int count) { if (up.button == 1) { - if (clockCommand && clockCommand[0] && - (taskBarLaunchOnSingleClick ? count == 1 : !(count % 2))) { - bool restore = timezone(); - smActionListener->runCommandOnce(clockClassHint, clockCommand, &fPid); - timezone(restore); - } -#ifdef DEBUG + //smActionListener->runCommandOnce(clockClassHint, clockCommand, &fPid); + system("osmo&"); } else if (up.button == 2) { - if ((count % 2) == 0) - countEvents = !countEvents; -#endif - } - else if (up.button == Button3) { - fMenu = new YMenu(); - fMenu->setActionListener(this); - fMenu->addItem(_("CLOCK"), -2, null, actionNull)->setEnabled(false); - fMenu->addSeparator(); - fMenu->addItem("%H:%M", -2, null, actionClockHM); - fMenu->addItem("%H:%M:%S", -2, null, actionClockHMS); - fMenu->addItem("%d %H:%M", -2, null, actionClockDHM); - if (!prettyClock) - fMenu->addItem(_("Date"), -2, null, actionClockDate); - fMenu->addItem(_("Default"), -2, null, actionClockDefault); - fMenu->addItem(_("_Disable"), -2, null, actionClose); - fMenu->addItem(_("_UTC"), -2, null, actionClockUTC)->setChecked(clockUTC); - fMenu->popup(nullptr, nullptr, nullptr, up.x_root, up.y_root, - YPopupWindow::pfCanFlipVertical | - YPopupWindow::pfCanFlipHorizontal | - YPopupWindow::pfPopupMenu); - } + system("runBrowser http://www.time.gov/&"); + } else if (up.button == 3) { + system("ktsuss /usr/local/bin/setDate.py&"); + } } void YClock::changeTimeFormat(const char* format) { diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/default.h /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/default.h --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/default.h 2024-02-23 14:41:21.825053182 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/default.h 2024-02-23 15:53:32.711645605 -0500 @@ -24,7 +24,7 @@ XIV(bool, focusRootWindow, false) XIV(bool, pointerColormap, true) XIV(bool, sizeMaximized, false) -XIV(bool, showMoveSizeStatus, true) +XIV(bool, showMoveSizeStatus, false) XIV(bool, workspaceSwitchStatus, true) XIV(bool, beepOnNewMail, false) XIV(bool, warpPointer, false) @@ -32,19 +32,19 @@ XIV(bool, opaqueMove, true) XIV(bool, opaqueResize, true) XIV(bool, hideTitleBarWhenMaximized, false) -XSV(const char *, winMenuItems, "rmsnxfhualytiecw") +XSV(const char *, winMenuItems, "nxfic") XIV(bool, showTaskBar, true) XIV(bool, taskBarAtTop, false) XIV(bool, taskBarKeepBelow, false) XIV(bool, taskBarShowClock, true) XIV(bool, taskBarShowApm, false) -XIV(bool, taskBarShowApmAuto, true) -XIV(bool, taskBarShowApmTime, true) -XIV(bool, taskBarShowApmGraph, true) -XIV(bool, taskBarShowMailboxStatus, true) +XIV(bool, taskBarShowApmAuto, false) +XIV(bool, taskBarShowApmTime, false) +XIV(bool, taskBarShowApmGraph, false) +XIV(bool, taskBarShowMailboxStatus, false) XIV(bool, taskBarShowStartMenu, true) -XIV(bool, taskBarShowWindowListMenu, true) -XIV(bool, taskBarShowWorkspaces, true) +XIV(bool, taskBarShowWindowListMenu, false) +XIV(bool, taskBarShowWorkspaces, false) XIV(bool, taskBarShowWindows, true) XIV(int, taskBarShowShowDesktopButton, 1) @@ -66,23 +66,23 @@ XSV(const char *, taskBarWorkspacesLimit, 0) XIV(bool, taskBarUseMouseWheel, true) XIV(int, taskBarTaskGrouping, 0) -XIV(bool, pagerShowPreview, true) -XIV(bool, pagerShowWindowIcons, true) -XIV(bool, pagerShowMinimized, true) -XIV(bool, pagerShowBorders, true) +XIV(bool, pagerShowPreview, false) +XIV(bool, pagerShowWindowIcons, false) +XIV(bool, pagerShowMinimized, false) +XIV(bool, pagerShowBorders, false) XIV(bool, pagerShowLabels, true) XIV(bool, pagerShowNumbers, false) -XIV(bool, taskBarShowCPUStatus, true) -XIV(bool, cpustatusShowRamUsage, true) -XIV(bool, cpustatusShowSwapUsage, true) -XIV(bool, cpustatusShowAcpiTemp, true) +XIV(bool, taskBarShowCPUStatus, false) +XIV(bool, cpustatusShowRamUsage, false) +XIV(bool, cpustatusShowSwapUsage, false) +XIV(bool, cpustatusShowAcpiTemp, false) XIV(bool, cpustatusShowAcpiTempInGraph, false) -XIV(bool, cpustatusShowCpuFreq, true) +XIV(bool, cpustatusShowCpuFreq, false) XIV(bool, netstatusShowOnlyRunning, false) -XIV(bool, taskBarShowMEMStatus, true) -XIV(bool, taskBarShowNetStatus, true) +XIV(bool, taskBarShowMEMStatus, false) +XIV(bool, taskBarShowNetStatus, false) XIV(bool, taskBarLaunchOnSingleClick, true) -XIV(bool, taskBarShowCollapseButton, false) +XIV(bool, taskBarShowCollapseButton, true) XIV(bool, minimizeToDesktop, false) XIV(bool, miniIconsPlaceHorizontal, false) XIV(bool, miniIconsRightToLeft, false) @@ -129,14 +129,14 @@ XIV(bool, clientMouseActions, true) XIV(bool, showPrograms, false) XIV(bool, showSettingsMenu, true) -XIV(bool, showFocusModeMenu, true) +XIV(bool, showFocusModeMenu, false) XIV(bool, showThemesMenu, true) XIV(bool, showLogoutMenu, true) XIV(bool, showLogoutSubMenu, true) XIV(bool, showAbout, true) -XIV(bool, showRun, true) -XIV(bool, showWindowList, true) -XIV(bool, showHelp, true) +XIV(bool, showRun, false) +XIV(bool, showWindowList, false) +XIV(bool, showHelp, false) XIV(bool, allowFullscreen, true) XIV(bool, fullscreenUseAllMonitors, false) XIV(bool, enableAddressBar, true) @@ -177,22 +177,22 @@ XSV(const char *, acpiIgnoreBatteries, 0) XSV(const char *, mailBoxPath, 0) -XSV(const char *, mailCommand, TERM " -name mutt -e mutt") -XSV(const char *, mailClassHint, "mutt.XTerm") +XSV(const char *, mailCommand, 0) +XSV(const char *, mailClassHint, 0) XSV(const char *, newMailCommand, 0) -XSV(const char *, lockCommand, 0) -XSV(const char *, clockCommand, "xclock -name icewm -title Clock") -XSV(const char *, clockClassHint, "icewm.XClock") +XSV(const char *, lockCommand, "xlock -mode matrix") +XSV(const char *, clockCommand, "runBrowser http://www.time.gov/") +XSV(const char *, clockClassHint, 0) XSV(const char *, runDlgCommand, 0) XSV(const char *, openCommand, 0) XSV(const char *, terminalCommand, TERM " -hold") 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, "sudo /sbin/shutdown -h now") +XSV(const char *, rebootCommand, "sudo /sbin/shutdown -r now") +XSV(const char *, suspendCommand, 0) +XSV(const char *, hibernateCommand, 0) #elif __OpenBSD__ || __NetBSD__ || __FreeBSD__ XSV(const char *, shutdownCommand, "shutdown -p now") XSV(const char *, rebootCommand, "shutdown -r now") @@ -231,13 +231,13 @@ XSV(const char *, addressBarCommand, 0) XSV(const char *, dockApps, "right high desktop") #ifdef CONFIG_I18N -XSV(const char *, fmtTime, "%X") +XSV(const char *, fmtTime, "%-I:%M") XSV(const char *, fmtTimeAlt, NULL) -XSV(const char *, fmtDate, "%c") +XSV(const char *, fmtDate, "%A %m/%d/%Y%n%T %Z %n%nLeft-Click to set the time %nR-Click to set timezone %nMiddle for U.S. Official Time") #else -XSV(const char *, fmtTime, "%H:%M:%S") +XSV(const char *, fmtTime, "sudo /sbin/shutdown -r now") XSV(const char *, fmtTimeAlt, NULL) -XSV(const char *, fmtDate, "%Y-%m-%d %H:%M:%S %z %B %A") +XSV(const char *, fmtDate, "%A %m/%d/%Y%n%T %Z %n%nLeft-Click to set the time %nR-Click to set timezone %nMiddle for U.S. Official Time") #endif #ifdef CFGDEF diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/icesm.cc /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/icesm.cc --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/icesm.cc 2024-02-23 14:41:21.828053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/icesm.cc 2024-02-23 17:09:08.848218712 -0500 @@ -771,8 +771,8 @@ xapp.loadEnv("env"); xapp.runWM(); - xapp.runIcesound(); - xapp.runIcewmbg(); +// xapp.runIcesound(); +// xapp.runIcewmbg(); int status = xapp.mainLoop(); diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/themable.h /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/themable.h --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/themable.h 2024-02-23 14:41:21.830053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/themable.h 2024-02-23 17:10:36.640210450 -0500 @@ -33,8 +33,8 @@ XIV(unsigned, scrollBarWidth, 16) XIV(unsigned, scrollBarHeight, 16) -XIV(unsigned, menuIconSize, 16) -XIV(unsigned, smallIconSize, 16) +XIV(unsigned, menuIconSize, 20) +XIV(unsigned, smallIconSize, 20) XIV(unsigned, largeIconSize, 32) XIV(unsigned, hugeIconSize, 48) diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmabout.cc /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmabout.cc --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmabout.cc 2024-02-23 14:41:21.831053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmabout.cc 2024-02-23 17:30:27.528098376 -0500 @@ -30,7 +30,8 @@ mstring copyright = copyhead + copysymb + " 1997-2012 Marko Macek, " + copysymb + " 2001 Mathias Hasselmann, \n\t" - + copysymb + " 2016-2023 Bert Gijsbers. \n"; + + copysymb + " 2016-2023 Bert Gijsbers. \n" + + copysymb + " Edited for Absolute Linux by Paul Sherman \n"; Ladder* ladder = new Ladder(); *ladder += label(version); diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmaction.h /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmaction.h --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmaction.h 2024-02-23 14:41:21.831053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmaction.h 2024-02-23 16:50:23.080324657 -0500 @@ -124,6 +124,14 @@ actionSysDialog = 259, actionIcewmbg = 261, actionHibernate = 263, + + actionRefreshMenu = 300, + actionSetGamma = 311, + actionScreenLock = 312, + actionGTKTheme = 313, + action_tLogin = 320, + action_gLogin = 321, + action_aLogin = 322, }; bool canShutdown(RebootShutdown reboot); diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmapp.cc /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmapp.cc --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmapp.cc 2024-02-23 14:41:21.831053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmapp.cc 2024-02-23 17:26:45.192119300 -0500 @@ -39,6 +39,7 @@ #include #include "ywordexp.h" #include "intl.h" +#include char const *ApplicationName("IceWM"); RebootShutdown rebootOrShutdown = Logout; @@ -506,35 +507,6 @@ void LogoutMenu::updatePopup() { if (itemCount()) return; - - if (showLogoutMenu) { - setShared(true); /// !!! get rid of this (refcount objects) - if (showLogoutSubMenu) { - addItem(_("_Logout"), -2, null, actionLogout, "logout"); - addItem(_("_Cancel logout"), -2, null, actionCancelLogout, - "cancel-logout")->setEnabled(false); - addSeparator(); - - int const oldItemCount = itemCount(); - if (canLock()) - addItem(_("Lock _Workstation"), -2, null, actionLock, "lock"); - if (canShutdown(Reboot)) - addItem(_("Re_boot"), -2, null, actionReboot, "reboot"); - if (canShutdown(Shutdown)) - addItem(_("Shut_down"), -2, null, actionShutdown, "shutdown"); - if (canSuspend()) - addItem(_("_Sleep mode"), -2, null, actionSuspend, "suspend"); - if (canHibernate()) - addItem(_("_Hibernate"), -2, null, actionHibernate, "hibernate"); - if (itemCount() != oldItemCount) - addSeparator(); - - addItem(_("Restart _Icewm"), -2, null, actionRestart, "restart"); - - addItem(_("Restart _Xterm"), -2, null, actionRestartXterm, "xterm"); - - } - } } void LayerMenu::updatePopup() { @@ -996,6 +968,21 @@ runCommand(runDlgCommand); } else if (action == actionExit) { exit(0); + } else if (action == action_tLogin) { + system("/usr/local/bin/set_login_type 3&"); + } else if (action == action_gLogin) { + system("/usr/local/bin/set_login_type 4&"); + } else if (action == action_aLogin) { + system("/usr/local/bin/autologin_set&"); + } else if (action == actionRefreshMenu) { + system("/usr/local/bin/refreshmenu&"); + } else if (action == actionSetGamma) { + system("/usr/local/bin/absgamma.py&"); + } else if (action == actionScreenLock) { + system("/usr/local/bin/xlock_chooser&"); + } else if (action == actionGTKTheme) { + system("/usr/local/bin/setgtktheme.py&"); + } else if (action == actionFocusClickToFocus) { setFocusMode(FocusClick); } else if (action == actionFocusMouseSloppy) { @@ -1923,15 +1910,7 @@ void YWMApp::doLogout(RebootShutdown reboot) { rebootOrShutdown = reboot; - if (!confirmLogout) - logout(); - else { - delete fLogoutMsgBox; - fLogoutMsgBox = new YMsgBox(YMsgBox::mbBoth, - _("Confirm Logout"), - _("Logout will close all active applications.\n" - "Proceed?"), this, "logout"); - } + logout(); } void YWMApp::logout() { diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmprog.cc /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmprog.cc --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmprog.cc 2024-02-23 14:41:21.834053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmprog.cc 2024-02-23 16:28:43.191446989 -0500 @@ -354,6 +354,12 @@ } } +LoginMenu::LoginMenu() { + addItem(("Text Based"), -2, null, action_tLogin); + addItem(("Graphic"), -2, null, action_gLogin); + addItem(("AutoLogin"), -2, null, action_aLogin); +} + HelpMenu::HelpMenu( IApp *app, YSMListener *smActionListener, @@ -434,39 +440,36 @@ settings->addItem(_("_About"), -2, actionAbout, nullptr, "about"); } - if (showHelp) { - HelpMenu* help = new HelpMenu(app, smActionListener, wmActionListener); - settings->addSubmenu(_("_Help"), -2, help, "help"); - } - - if (showFocusModeMenu) { - FocusMenu *focus = new FocusMenu(); - settings->addSubmenu(_("_Focus"), -2, focus, "focus"); - } - - if (showSettingsMenu) { - PrefsMenu *prefs = new PrefsMenu(); - settings->addSubmenu(_("_Preferences"), -2, prefs, "pref"); - } - + settings->addItem(_("Restart _Icewm"), -2, null, actionRestart, "restart"); + settings->addItem(_("Refresh Menu"), -2, actionRefreshMenu, 0, "refresh"); + settings->addSeparator(); + if (showThemesMenu) { YMenu *themes = new ThemesMenu(app, smActionListener, wmActionListener); - settings->addSubmenu(_("_Themes"), -2, themes, "themes"); + settings->addSubmenu(_("Icewm Themes"), -2, themes, "list"); } - + settings->addItem(("GTK Theme"), -2, actionGTKTheme, 0, "themes"); + settings->addSeparator(); + + settings->addItem(("Monitor Gamma"), -2, actionSetGamma, 0, "absgamma"); + settings->addItem(("Set Lock Screen"), -2, actionScreenLock, 0, "lockscreen"); + + settings->addSeparator(); + + LoginMenu *login_type = new LoginMenu(); + settings->addSubmenu(("Login Type"), -2, login_type, "list"); + if (settings->itemCount()) { addSubmenu(_("Se_ttings"), -2, settings, "settings"); } else { delete settings; } - if (showLogoutMenu) { - addSeparator(); - if (showLogoutSubMenu) - addItem(_("_Logout..."), -2, actionLogout, logoutMenu, "logout"); - else - addItem(_("_Logout..."), -2, null, actionLogout, "logout"); - } + addSeparator(); + + addItem(_("Logout"), -2, null, actionLogout, "logout"); + addItem(_("Reboot"), -2, null, actionReboot, "reboot"); + addItem(_("Shut_down"), -2, null, actionShutdown, "shutdown"); } // vim: set sw=4 ts=4 et: diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmprog.h /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmprog.h --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmprog.h 2024-02-23 14:41:21.834053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmprog.h 2024-02-23 16:19:22.567499749 -0500 @@ -138,6 +138,11 @@ FocusMenu(); }; +class LoginMenu: public YMenu { +public: + LoginMenu(); +}; + class HelpMenu: public ObjectMenu { public: HelpMenu(IApp *app, diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmtaskbar.cc /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmtaskbar.cc --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/wmtaskbar.cc 2024-02-23 14:41:21.835053181 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/wmtaskbar.cc 2024-02-23 16:17:21.927511102 -0500 @@ -333,7 +333,7 @@ fApplications = new ObjectButton(this, new LazyRootMenu); fApplications->setActionListener(this); fApplications->setImage(taskbarStartImage); - fApplications->setToolTip(_("Favorite Applications")); + fApplications->setToolTip(_("Start Menu\n\nPress:\nCtrl-Alt-Del\nfor the Task Menu")); fApplications->setTitle("TaskBarMenu"); fApplications->realize(); } else diff -Naur /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/yprefs.h /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/yprefs.h --- /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223/src/yprefs.h 2024-02-23 14:41:21.840053180 -0500 +++ /usr/src/repo/builds_15/icewm_new_BUILD/icewm_20240223_edited1/src/yprefs.h 2024-02-23 16:15:53.447519429 -0500 @@ -6,7 +6,7 @@ XIV(bool, dontRotateMenuPointer, true) XIV(bool, fontPreferFreetype, true) -XIV(bool, menuMouseTracking, false) +XIV(bool, menuMouseTracking, true) XIV(bool, replayMenuCancelClick, false) XIV(bool, showPopupsAbovePointer, false) XIV(bool, showEllipsis, true) @@ -35,9 +35,8 @@ XIV(bool, grabRootWindow, true) XSV(const char *, iconPath, - "/usr/local/share/icons:" - "/usr/local/share/pixmaps:" - "/usr/share/icons:" + "/usr/share/icewm/icons:" + "/usr/share/icons/hicolor:" "/usr/share/pixmaps:" ) XSV(const char *, iconThemes, "*:-HighContrast")