icewm/lib/keys.in | 27 ++++++++++++---------- icewm/lib/toolbar.in | 13 +++++++++- icewm/src/bindkey.h | 54 ++++++++++++++++++++++---------------------- icewm/src/default.h | 31 +++++++++++++++---------- icewm/src/icewmbg_prefs.h | 8 +++--- icewm/src/themable.h | 8 ++++++ icewm/src/yconfig.cc | 4 +++ icewm/src/ylocale.cc | 3 +- icewm/src/yprefs.h | 4 +- 9 files changed, 90 insertions(+), 62 deletions(-) diff --git a/icewm/lib/keys.in b/icewm/lib/keys.in index 7320997..12cf4a5 100644 --- a/icewm/lib/keys.in +++ b/icewm/lib/keys.in @@ -9,28 +9,31 @@ # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper. # -key "Alt+Ctrl+t" xterm +key "Alt+Ctrl+t" xvt key "Alt+Ctrl+f" fte +key "Alt+Ctrl+p" psi +key "Alt+Ctrl+x" xchat +key "Alt+Ctrl+l" xscreensaver-command -lock key "Alt+Ctrl+e" nedit key "Alt+Ctrl+g" gimp -key "Alt+Ctrl+n" netscape -noraise -remote openBrowser -key "Alt+Ctrl+b" netscape -noraise -remote openBookmarks -key "Alt+Ctrl+m" netscape -noraise -remote openURL(mailto:,new-window) +key "Alt+Ctrl+n" firefox -remote openBrowser +key "Alt+Ctrl+b" firefox -remote openBookmarks +key "Alt+Ctrl+m" firefox -remote openURL(mailto:,new-window) -key "Alt+Ctrl+KP_Divide" aumix -v -5 # lower volume -key "Alt+Ctrl+KP_Multiply" aumix -v +5 # raise volume +key "Alt+Ctrl+KP_Divide" amixer sset Master 5- >/dev/null 2>&1 # lower volume +key "Alt+Ctrl+KP_Multiply" amixer sset Master 5+ >/dev/null 2>&1 # raise volume # "Multimedia key" bindings for XFree86. Gather the keycodes of your # advanced function keys by watching the output of the xev command whilest # pressing those keys and map those symbols by using xmodmap. key "XF86Standby" killall -QUIT icewm -key "XF86AudioLowerVolume" aumix -v -5 -key "XF86AudioRaiseVolume" aumix -v +5 -key "XF86AudioMute" aumix -v 0 +key "XF86AudioLowerVolume" amixer sset Master 5- >/dev/null 2>&1 +key "XF86AudioRaiseVolume" amixer sset Master 5+ >/dev/null 2>&1 +key "XF86AudioMute" amixer sset Master toggle >/dev/null key "XF86AudioPlay" cdplay play 1 key "XF86AudioStop" cdplay stop -key "XF86HomePage" netscape -noraise -remote openHomepage -key "XF86Mail" netscape -noraise -remote openURL(mailto:,new-window) -key "XF86Search" netscape -noraise -remote openURL(http://www.google.com/) +key "XF86HomePage" firefox -remote openHomepage +key "XF86Mail" firefox -remote openURL(mailto:,new-window) +key "XF86Search" firefox -remote openURL(http://www.altlinux.org/) key "XF86Eject" eject diff --git a/icewm/lib/toolbar.in b/icewm/lib/toolbar.in index 3420345..d543961 100644 --- a/icewm/lib/toolbar.in +++ b/icewm/lib/toolbar.in @@ -4,6 +4,15 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog XTerm xterm xterm -prog FTE fte fte +prog Screensaver lock xscreensaver-command -lock +prog Terminal xterm xvt +prog Emacs emacs emacs prog Netscape netscape netscape +runonce Firefox firefox firefox-bin firefox +runonce Thunderbird thunderbird thunderbird-bin thunderbird +prog XChat xchat xchat +prog licq licq licq +runonce GQView gqview gqview gqview +runonce Xmms winamp XMMS_Player xmms +prog Eject - eject +prog Insert - eject -t diff --git a/icewm/src/bindkey.h b/icewm/src/bindkey.h index 6ea53b7..65980d0 100644 --- a/icewm/src/bindkey.h +++ b/icewm/src/bindkey.h @@ -2,23 +2,23 @@ #define defgMouseWinSize XK_Pointer_Button3, kfAlt, "Alt+Pointer_Button3" #define defgMouseWinRaise XK_Pointer_Button1, kfCtrl+kfAlt, "Ctrl+Alt+Pointer_Button1" -#define defgKeyWinRaise XK_F1, kfAlt, "Alt+F1" -#define defgKeyWinOccupyAll XK_F2, kfAlt, "Alt+F2" -#define defgKeyWinLower XK_F3, kfAlt, "Alt+F3" -#define defgKeyWinClose XK_F4, kfAlt, "Alt+F4" +#define defgKeyWinRaise XK_1, kfAlt, "Alt+1" +#define defgKeyWinOccupyAll XK_2, kfAlt, "Alt+2" +#define defgKeyWinLower XK_3, kfAlt, "Alt+3" +#define defgKeyWinClose XK_4, kfAlt, "Alt+4" #define defgKeyWinKill 0, 0, "" -#define defgKeyWinRestore XK_F5, kfAlt, "Alt+F5" -#define defgKeyWinNext XK_F6, kfAlt, "Alt+F6" -#define defgKeyWinPrev XK_F6, kfAlt+kfShift, "Alt+Shift+F6" -#define defgKeyWinMove XK_F7, kfAlt, "Alt+F7" -#define defgKeyWinSize XK_F8, kfAlt, "Alt+F8" -#define defgKeyWinMinimize XK_F9, kfAlt, "Alt+F9" -#define defgKeyWinMaximize XK_F10, kfAlt, "Alt+F10" -#define defgKeyWinMaximizeVert XK_F10, kfAlt+kfShift, "Alt+Shift+F10" +#define defgKeyWinRestore XK_5, kfAlt, "Alt+5" +#define defgKeyWinNext XK_6, kfAlt, "Alt+6" +#define defgKeyWinPrev XK_6, kfAlt+kfShift, "Alt+Shift+6" +#define defgKeyWinMove XK_7, kfAlt, "Alt+7" +#define defgKeyWinSize XK_8, kfAlt, "Alt+8" +#define defgKeyWinMinimize XK_9, kfAlt, "Alt+9" +#define defgKeyWinMaximize XK_0, kfAlt, "Alt+0" +#define defgKeyWinMaximizeVert XK_0, kfAlt+kfShift, "Alt+Shift+0" #define defgKeyWinMaximizeHoriz 0, 0, "" -#define defgKeyWinFullscreen XK_F11, kfAlt, "Alt+F11" -#define defgKeyWinHide XK_F12, kfAlt+kfShift, "Alt+Shift+F12" -#define defgKeyWinRollup XK_F12, kfAlt, "Alt+F12" +#define defgKeyWinFullscreen XK_bracketleft, kfAlt, "Alt+[" +#define defgKeyWinHide XK_bracketright, kfAlt+kfShift, "Alt+Shift+]" +#define defgKeyWinRollup XK_bracketright, kfAlt, "Alt+]" #define defgKeyWinArrangeN XK_KP_Up, kfCtrl+kfAlt, "Ctrl+Alt+KP_8" #define defgKeyWinArrangeNE XK_KP_Prior, kfCtrl+kfAlt, "Ctrl+Alt+KP_9" #define defgKeyWinArrangeE XK_KP_Right, kfCtrl+kfAlt, "Ctrl+Alt+KP_6" @@ -55,18 +55,18 @@ #define defgKeySysWorkspacePrevTakeWin XK_Left, kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+Left" #define defgKeySysWorkspaceNextTakeWin XK_Right, kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+Right" #define defgKeySysWorkspaceLastTakeWin XK_Down, kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+Down" -#define defgKeySysWorkspace1 '1', kfAlt+kfCtrl, "Alt+Ctrl+1" -#define defgKeySysWorkspace2 '2', kfAlt+kfCtrl, "Alt+Ctrl+2" -#define defgKeySysWorkspace3 '3', kfAlt+kfCtrl, "Alt+Ctrl+3" -#define defgKeySysWorkspace4 '4', kfAlt+kfCtrl, "Alt+Ctrl+4" -#define defgKeySysWorkspace5 '5', kfAlt+kfCtrl, "Alt+Ctrl+5" -#define defgKeySysWorkspace6 '6', kfAlt+kfCtrl, "Alt+Ctrl+6" -#define defgKeySysWorkspace7 '7', kfAlt+kfCtrl, "Alt+Ctrl+7" -#define defgKeySysWorkspace8 '8', kfAlt+kfCtrl, "Alt+Ctrl+8" -#define defgKeySysWorkspace9 '9', kfAlt+kfCtrl, "Alt+Ctrl+9" -#define defgKeySysWorkspace10 '0', kfAlt+kfCtrl, "Alt+Ctrl+0" -#define defgKeySysWorkspace11 '-', kfAlt+kfCtrl, "Alt+Ctrl+bracketleft" -#define defgKeySysWorkspace12 '=', kfAlt+kfCtrl, "Alt+Ctrl+bracketright" +#define defgKeySysWorkspace1 XK_F1, kfAlt, "Alt+F1" +#define defgKeySysWorkspace2 XK_F2, kfAlt, "Alt+F2" +#define defgKeySysWorkspace3 XK_F3, kfAlt, "Alt+F3" +#define defgKeySysWorkspace4 XK_F4, kfAlt, "Alt+F4" +#define defgKeySysWorkspace5 XK_F5, kfAlt, "Alt+F5" +#define defgKeySysWorkspace6 XK_F6, kfAlt, "Alt+F6" +#define defgKeySysWorkspace7 XK_F7, kfAlt, "Alt+F7" +#define defgKeySysWorkspace8 XK_F8, kfAlt, "Alt+F8" +#define defgKeySysWorkspace9 XK_F9, kfAlt, "Alt+F9" +#define defgKeySysWorkspace10 XK_F10, kfAlt, "Alt+F10" +#define defgKeySysWorkspace11 XK_F11, kfAlt, "Alt+F11" +#define defgKeySysWorkspace12 XK_F12, kfAlt, "Alt+F12" #define defgKeySysWorkspace1TakeWin '1', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+1" #define defgKeySysWorkspace2TakeWin '2', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+2" #define defgKeySysWorkspace3TakeWin '3', kfAlt+kfCtrl+kfShift, "Alt+Ctrl+Shift+3" diff --git a/icewm/src/default.h b/icewm/src/default.h index e967e64..55a5d83 100644 --- a/icewm/src/default.h +++ b/icewm/src/default.h @@ -26,14 +26,13 @@ XIV(bool, pointerColormap, true) XIV(bool, sizeMaximized, false) XIV(bool, showMoveSizeStatus, true) XIV(bool, workspaceSwitchStatus, true) -XIV(bool, beepOnNewMail, false) +XIV(bool, beepOnNewMail, true) XIV(bool, warpPointer, false) XIV(bool, opaqueMove, true) XIV(bool, opaqueResize, true) XSV(const char *, winMenuItems, "rmsnxfhualyticw") #ifdef CONFIG_TASKBAR XIV(bool, showTaskBar, true) -XIV(bool, taskBarAtTop, false) XIV(bool, taskBarKeepBelow, false) XIV(bool, taskBarShowClock, true) XIV(bool, taskBarShowApm, false) @@ -55,7 +54,6 @@ XIV(bool, taskBarShowAllWindows, false) XIV(bool, taskBarShowWindowIcons, true) XIV(bool, taskBarAutoHide, false) XIV(bool, taskBarFullscreenAutoShow, true) -XIV(bool, taskBarDoubleHeight, false) XIV(bool, taskBarWorkspacesLeft, true) XIV(bool, taskBarShowCPUStatus, true) XIV(bool, taskBarShowNetStatus, true) @@ -71,7 +69,7 @@ XIV(bool, smartPlacement, true) XIV(bool, centerTransientsOnOwner, true) XIV(bool, autoRaise, false) XIV(bool, delayPointerFocus, true) -XIV(bool, useMouseWheel, false) +XIV(bool, useMouseWheel, true) XIV(bool, quickSwitch, true) XIV(bool, quickSwitchToMinimized, true) XIV(bool, quickSwitchToHidden, true) @@ -84,7 +82,7 @@ XIV(bool, quickSwitchSmallWindow, false) XIV(bool, quickSwitchMaxWidth, false) XIV(bool, quickSwitchHugeIcon, false) XIV(bool, quickSwitchFillSelection, false) -XIV(bool, countMailMessages, false) +XIV(bool, countMailMessages, true) XIV(bool, strongPointerFocus, false) XIV(bool, snapMove, true) XIV(bool, edgeHorzWorkspaceSwitching, false) @@ -146,8 +144,8 @@ XSV(const char *, acpiIgnoreBatteries, 0) #endif XSV(const char *, mailBoxPath, 0) -XSV(const char *, mailCommand, "xterm -name pine -title PINE -e pine") -XSV(const char *, mailClassHint, "pine.XTerm") +XSV(const char *, mailCommand, "xterm -name mutt -title MUTT -e mutt") +XSV(const char *, mailClassHint, "mutt.XTerm") XSV(const char *, newMailCommand, 0) XSV(const char *, lockCommand, 0) XSV(const char *, clockCommand, "xclock -name icewm -title Clock") @@ -157,15 +155,15 @@ XSV(const char *, openCommand, 0) XSV(const char *, terminalCommand, "xterm") XSV(const char *, logoutCommand, 0) XSV(const char *, logoutCancelCommand, 0) -XSV(const char *, shutdownCommand, 0) -XSV(const char *, rebootCommand, 0) +XSV(const char *, shutdownCommand, "poweroff") +XSV(const char *, rebootCommand, "reboot") XIV(int, taskBarCPUDelay, 500) XIV(int, taskBarNetSamples, 20) XIV(int, taskBarNetDelay, 500) XSV(const char *, cpuCommand, "xterm -name top -title Process\\ Status -e top") XSV(const char *, cpuClassHint, "top.XTerm") -XSV(const char *, netCommand, "xterm -name netstat -title 'Network Status' -e netstat -c") -XSV(const char *, netClassHint, "netstat.XTerm") +XSV(const char *, netCommand, "xterm -name iftop -title 'Network Status' -e iftop") +XSV(const char *, netClassHint, "iftop.XTerm") XSV(const char *, netDevice, "ppp0 eth0") XSV(const char *, addressBarCommand, 0) #ifdef CONFIG_I18N @@ -250,7 +248,6 @@ cfoption icewm_preferences[] = { OBV("AutoReloadMenus", &autoReloadMenus, "Reload menu files automatically"), #ifdef CONFIG_TASKBAR OBV("ShowTaskBar", &showTaskBar, "Show task bar"), - OBV("TaskBarAtTop", &taskBarAtTop, "Task bar at top of the screen"), OBV("TaskBarKeepBelow", &taskBarKeepBelow, "Keep the task bar below regular windows"), OBV("TaskBarAutoHide", &taskBarAutoHide, "Auto hide task bar after delay"), OBV("TaskBarFullscreenAutoShow", &taskBarFullscreenAutoShow, "Auto show task bar when fullscreen window active"), @@ -276,7 +273,6 @@ cfoption icewm_preferences[] = { OBV("TaskBarShowCPUStatus", &taskBarShowCPUStatus, "Show CPU status on task bar (Linux & Solaris)"), OBV("TaskBarShowNetStatus", &taskBarShowNetStatus, "Show network status on task bar (Linux only)"), OBV("TaskBarShowCollapseButton", &taskBarShowCollapseButton, "Show a button to collapse the taskbar"), - OBV("TaskBarDoubleHeight", &taskBarDoubleHeight, "Use double-height task bar"), OBV("TaskBarWorkspacesLeft", &taskBarWorkspacesLeft, "Place workspace pager on left, not right"), OBV("TaskBarLaunchOnSingleClick", &taskBarLaunchOnSingleClick, "Execute taskbar applet commands (like MailCommand, ClockCommand, ...) on single click"), #endif @@ -409,6 +405,15 @@ cfoption icewm_preferences[] = { OKV("KeyWinArrangeW", gKeyWinArrangeW, ""), OKV("KeyWinArrangeNW", gKeyWinArrangeNW, ""), OKV("KeyWinArrangeC", gKeyWinArrangeC, ""), + OKV("KeyWinSnapMoveN", gKeyWinSnapMoveN, "Move the window up until its bounce to an other window border"), + OKV("KeyWinSnapMoveNE", gKeyWinSnapMoveNE, "Move the window up/right until its bounce to an other window border"), + OKV("KeyWinSnapMoveE", gKeyWinSnapMoveE, "Move the window right until its bounce to an other window border"), + OKV("KeyWinSnapMoveSE", gKeyWinSnapMoveSE, "Move the window down/right until its bounce to an other window border"), + OKV("KeyWinSnapMoveS", gKeyWinSnapMoveS, "Move the window down until its bounce to an other window border"), + OKV("KeyWinSnapMoveSW", gKeyWinSnapMoveSW, "Move the window down/left until its bounce to an other window border"), + OKV("KeyWinSnapMoveW", gKeyWinSnapMoveW, "Move the window left until its bounce to an other window border"), + OKV("KeyWinSnapMoveNW", gKeyWinSnapMoveNW, "Move the window up/left until its bounce to an other window border"), + OKV("KeyWinSmartPlace", gKeyWinSmartPlace, "Smart window placement (minimal overlap)"), OKV("KeySysSwitchNext", gKeySysSwitchNext, ""), OKV("KeySysSwitchLast", gKeySysSwitchLast, ""), OKV("KeySysWinNext", gKeySysWinNext, ""), diff --git a/icewm/src/icewmbg_prefs.h b/icewm/src/icewmbg_prefs.h index 82de8c7..b03dfde 100644 --- a/icewm/src/icewmbg_prefs.h +++ b/icewm/src/icewmbg_prefs.h @@ -3,12 +3,12 @@ #include "yconfig.h" -XSV(const char *, DesktopBackgroundColor, "rgb:00/20/40") -XSV(const char *, DesktopBackgroundPixmap, 0) +XSV(const char *, DesktopBackgroundColor, "rgb:4f/4f/a7") +XSV(const char *, DesktopBackgroundPixmap, "/usr/share/artworks/backgrounds/default.png") XSV(const char *, DesktopTransparencyColor, 0) XSV(const char *, DesktopTransparencyPixmap, 0) -XIV(bool, desktopBackgroundScaled, false) -XIV(bool, centerBackground, false) +XIV(bool, desktopBackgroundScaled, true) +XIV(bool, centerBackground, true) XIV(bool, supportSemitransparency, true) void addBgImage(const char *name, const char *value, bool); diff --git a/icewm/src/themable.h b/icewm/src/themable.h index ad6a7ce..a06c5c6 100644 --- a/icewm/src/themable.h +++ b/icewm/src/themable.h @@ -16,6 +16,10 @@ XIV(bool, titleBarJoinLeft, false) XIV(bool, titleBarJoinRight, false) XIV(bool, showFrameIcon, true) +#ifdef CONFIG_TASKBAR +XIV(bool, taskBarAtTop, false) +XIV(bool, taskBarDoubleHeight, false) +#endif XIV(int, wsBorderX, 6) XIV(int, wsBorderY, 6) XIV(int, wsDlgBorderX, 2) @@ -157,6 +161,10 @@ cfoption icewm_themable_preferences[] = { OBV("TaskBarClockLeds", &prettyClock, "Task bar clock/APM uses nice pixmapped LCD display (but then it doesn't display correctly in many languages anymore, e.g. for Japanese and Korean it works only when a real font is used and not the LEDs"), OBV("TrayDrawBevel", &trayDrawBevel, "Surround the tray with plastic border"), +#ifdef CONFIG_TASKBAR + OBV("TaskBarAtTop", &taskBarAtTop, "Task bar at top of the screen"), + OBV("TaskBarDoubleHeight", &taskBarDoubleHeight, "Use double-height task bar"), +#endif OBV("TitleBarCentered", &titleBarCentered, "Draw window title centered (obsoleted by TitleBarJustify)"), OBV("TitleBarJoinLeft", &titleBarJoinLeft, "Join title*S and title*T"), OBV("TitleBarJoinRight", &titleBarJoinRight, "Join title*T and title*B"), diff --git a/icewm/src/yconfig.cc b/icewm/src/yconfig.cc index 74edd82..5537742 100644 --- a/icewm/src/yconfig.cc +++ b/icewm/src/yconfig.cc @@ -243,6 +243,10 @@ char *setOption(cfoption *options, char *name, char *arg, bool append, char *res if (options[a].v.bool_value) { if ((arg[0] == '1' || arg[0] == '0') && arg[1] == 0) { *(options[a].v.bool_value) = (arg[0] == '1') ? true : false; + } else if (!strcasecmp(arg, "true") || !strcasecmp(arg, "yes")) { + *(options[a].v.bool_value) = true; + } else if (!strcasecmp(arg, "false") || !strcasecmp(arg, "no")) { + *(options[a].v.bool_value) = false; } else { msg(_("Bad argument: %s for %s"), arg, name); return rest; diff --git a/icewm/src/ylocale.cc b/icewm/src/ylocale.cc index b3a255c..0c9cc95 100644 --- a/icewm/src/ylocale.cc +++ b/icewm/src/ylocale.cc @@ -47,8 +47,7 @@ YLocale::YLocale(char const * localeName) { "Falling back to 'C' locale'.")); fLocaleName = setlocale(LC_ALL, "C"); } -/// TODO #warning "should always use multibyte/fontset if I18N" - multiByte = (MB_CUR_MAX > 1); + multiByte = true; char const * codeset = NULL; int const codesetItems[] = { CONFIG_NL_CODESETS }; diff --git a/icewm/src/yprefs.h b/icewm/src/yprefs.h index f530855..525782c 100644 --- a/icewm/src/yprefs.h +++ b/icewm/src/yprefs.h @@ -35,10 +35,10 @@ XIV(bool, disableImlibCaches, true) #ifdef CONFIG_XFREETYPE XIV(bool, haveXft, true) #endif -XSV(const char *, iconPath, 0) +XSV(const char *, iconPath, "/usr/share/icons/hicolor:/usr/share/icons/locolor:/usr/share/icons/large:/usr/share/icons:/usr/share/icons/mini:/usr/X11R6/lib/X11/icewm/icons:/usr/share/X11/icewm/icons:/usr/share/pixmaps") XSV(const char *, libDir, LIBDIR) XSV(const char *, configDir, CFGDIR) -#define CONFIG_DEFAULT_THEME "icedesert/default.theme" +#define CONFIG_DEFAULT_THEME "default/default.theme" XSV(const char *, themeName, CONFIG_DEFAULT_THEME) #define CONFIG_DEFAULT_LOOK lookNice