Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add active window variants of ButtonClose et al. #638

Merged
merged 2 commits into from
Sep 14, 2024
Merged

Add active window variants of ButtonClose et al. #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fcea14
Add active window variants of ButtonClose et al.
Taylor-Finch Sep 1, 2024
30dfd3a
Update manual
Taylor-Finch Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions jwm.1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,26 +2006,51 @@ The following tags may also be supplied:
An icon to display for the close button on client windows instead of the
default.
.RE
.B ButtonCloseFocus
.RS
An icon to display for the close button on active client windows instead
of the default.
.RE
.B ButtonMax
.RS
An icon to display for the maximize button on client windows instead of the
default.
.RE
.B ButtonMaxFocus
.RS
An icon to display for the maximize button on active client windows instead
of the default.
.RE
.B ButtonMaxActive
.RS
An icon to display for the maximize button on maximized client windows instead
of the default.
.RE
.B ButtonMaxActiveFocus
.RS
An icon to display for the maximize button on active maximized client windows
instead of the default.
.RE
.B ButtonMenu
.RS
An icon to display for the menu button on client windows instead of the
default. This is used for client windows that do not specify an icon.
.RE
.B ButtonMenuFocus
.RS
An icon to display for the menu button on active client windows instead
of the default. This is used for client windows that do not specify an icon.
.RE
.B ButtonMin
.RS
An icon to display for the minimize button on client windows instead
of the default.
.RE
.B ButtonMinFocus
.RS
An icon to display for the minimize button on active client windows
instead of the default.
.RE
.B DefaultIcon
.RS
An icon to display for windows that do not specify an icon.
Expand Down
57 changes: 37 additions & 20 deletions src/border.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ static char DrawBorderIcon(BorderIconType t,
unsigned xoffset, unsigned yoffset,
Pixmap canvas, long fg);
static void DrawIconButton(const ClientNode *np, int x, int y,
Pixmap canvas, GC gc, long fg);
Pixmap canvas, GC gc, long fg, char active);
static void DrawCloseButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg);
Pixmap canvas, GC gc, long fg, char active);
static void DrawMaxIButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg);
Pixmap canvas, GC gc, long fg, char active);
static void DrawMaxAButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg);
Pixmap canvas, GC gc, long fg, char active);
static void DrawMinButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg);
Pixmap canvas, GC gc, long fg, char active);

#ifdef USE_SHAPE
static void FillRoundedRectangle(Drawable d, GC gc, int x, int y,
Expand Down Expand Up @@ -786,23 +786,25 @@ void DrawBorderHandles(const ClientNode *np, Pixmap canvas, GC gc)
void DrawBorderButton(const ClientNode *np, MouseContextType context,
int x, int y, Pixmap canvas, GC gc, long fg)
{
const char isActive = (np->state.status & STAT_ACTIVE)
&& IsClientOnCurrentDesktop(np);
JXSetForeground(display, gc, fg);
switch(context) {
case MC_CLOSE:
DrawCloseButton(x, y, canvas, gc, fg);
DrawCloseButton(x, y, canvas, gc, fg, isActive);
break;
case MC_MINIMIZE:
DrawMinButton(x, y, canvas, gc, fg);
DrawMinButton(x, y, canvas, gc, fg, isActive);
break;
case MC_MAXIMIZE:
if(np->state.maxFlags) {
DrawMaxAButton(x, y, canvas, gc, fg);
DrawMaxAButton(x, y, canvas, gc, fg, isActive);
} else {
DrawMaxIButton(x, y, canvas, gc, fg);
DrawMaxIButton(x, y, canvas, gc, fg, isActive);
}
break;
case MC_ICON:
DrawIconButton(np, x, y, canvas, gc, fg);
DrawIconButton(np, x, y, canvas, gc, fg, isActive);
break;
default:
Assert(0);
Expand Down Expand Up @@ -960,15 +962,17 @@ char DrawBorderIcon(BorderIconType t,

/** Draw a close button. */
void DrawCloseButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg)
Pixmap canvas, GC gc, long fg, char active)
{
XSegment segments[2];
const unsigned titleHeight = GetTitleHeight();
unsigned size;
unsigned x1, y1;
unsigned x2, y2;

if(DrawBorderIcon(BI_CLOSE, xoffset, yoffset, canvas, fg)) {
if(active && DrawBorderIcon(BI_CLOSE_FOCUS, xoffset, yoffset, canvas, fg)) {
return;
} else if(DrawBorderIcon(BI_CLOSE, xoffset, yoffset, canvas, fg)) {
return;
}

Expand Down Expand Up @@ -998,7 +1002,7 @@ void DrawCloseButton(unsigned xoffset, unsigned yoffset,

/** Draw an inactive maximize button. */
void DrawMaxIButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg)
Pixmap canvas, GC gc, long fg, char active)
{

XSegment segments[5];
Expand All @@ -1007,7 +1011,9 @@ void DrawMaxIButton(unsigned xoffset, unsigned yoffset,
unsigned int x1, y1;
unsigned int x2, y2;

if(DrawBorderIcon(BI_MAX, xoffset, yoffset, canvas, fg)) {
if(active && DrawBorderIcon(BI_MAX_FOCUS, xoffset, yoffset, canvas, fg)) {
return;
} else if(DrawBorderIcon(BI_MAX, xoffset, yoffset, canvas, fg)) {
return;
}

Expand Down Expand Up @@ -1052,7 +1058,7 @@ void DrawMaxIButton(unsigned xoffset, unsigned yoffset,

/** Draw an active maximize button. */
void DrawMaxAButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg)
Pixmap canvas, GC gc, long fg, char active)
{
XSegment segments[8];
unsigned titleHeight;
Expand All @@ -1061,7 +1067,9 @@ void DrawMaxAButton(unsigned xoffset, unsigned yoffset,
unsigned x2, y2;
unsigned x3, y3;

if(DrawBorderIcon(BI_MAX_ACTIVE, xoffset, yoffset, canvas, fg)) {
if(active && DrawBorderIcon(BI_MAX_ACTIVE_FOCUS, xoffset, yoffset, canvas, fg)) {
return;
} else if(DrawBorderIcon(BI_MAX_ACTIVE, xoffset, yoffset, canvas, fg)) {
return;
}

Expand Down Expand Up @@ -1123,14 +1131,16 @@ void DrawMaxAButton(unsigned xoffset, unsigned yoffset,

/** Draw a minimize button. */
void DrawMinButton(unsigned xoffset, unsigned yoffset,
Pixmap canvas, GC gc, long fg)
Pixmap canvas, GC gc, long fg, char active)
{
unsigned titleHeight;
unsigned size;
unsigned x1, y1;
unsigned x2, y2;

if(DrawBorderIcon(BI_MIN, xoffset, yoffset, canvas, fg)) {
if(active && DrawBorderIcon(BI_MIN_FOCUS, xoffset, yoffset, canvas, fg)) {
return;
} else if(DrawBorderIcon(BI_MIN, xoffset, yoffset, canvas, fg)) {
return;
}

Expand All @@ -1150,15 +1160,22 @@ void DrawMinButton(unsigned xoffset, unsigned yoffset,

/* Draw the title icon. */
void DrawIconButton(const ClientNode *np, int x, int y,
Pixmap canvas, GC gc, long fg)
Pixmap canvas, GC gc, long fg, char active)
{
#ifdef USE_ICONS
const char hasIcon = np->icon ? 1 : 0;
const int titleHeight = GetTitleHeight();
const int iconSize = hasIcon ? GetBorderIconSize() : Max((int)titleHeight - 2, 0);
const int iconXOffset = (titleHeight - iconSize) / 2;
const int iconYOffset = hasIcon ? iconXOffset : iconXOffset + 1;
IconNode *icon = hasIcon ? np->icon : buttonIcons[BI_MENU];
IconNode *icon;
if(hasIcon) {
icon = np->icon;
} else if(active && (buttonIcons[BI_MENU_FOCUS] != NULL)) {
icon = buttonIcons[BI_MENU_FOCUS];
} else {
icon = buttonIcons[BI_MENU];
}
PutIcon(icon, canvas, fg,
x + iconXOffset,
y + iconYOffset,
Expand Down
17 changes: 11 additions & 6 deletions src/border.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@ struct ClientState;

/** Border icon types. */
typedef unsigned char BorderIconType;
#define BI_CLOSE 0
#define BI_MAX 1
#define BI_MAX_ACTIVE 2
#define BI_MENU 3
#define BI_MIN 4
#define BI_COUNT 5
#define BI_CLOSE 0
#define BI_CLOSE_FOCUS 1
#define BI_MAX 2
#define BI_MAX_FOCUS 3
#define BI_MAX_ACTIVE 4
#define BI_MAX_ACTIVE_FOCUS 5
#define BI_MENU 6
#define BI_MENU_FOCUS 7
#define BI_MIN 8
#define BI_MIN_FOCUS 9
#define BI_COUNT 10

/*@{*/
void InitializeBorders(void);
Expand Down
157 changes: 81 additions & 76 deletions src/lex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,82 +19,87 @@ static const int BLOCK_SIZE = 16;
* These must be sorted.
*/
static const StringMappingType TOKEN_MAP[] = {
{ "Active", TOK_ACTIVE },
{ "Background", TOK_BACKGROUND },
{ "Button", TOK_BUTTON },
{ "ButtonClose", TOK_BUTTONCLOSE },
{ "ButtonMax", TOK_BUTTONMAX },
{ "ButtonMaxActive", TOK_BUTTONMAXACTIVE },
{ "ButtonMenu", TOK_BUTTONMENU },
{ "ButtonMin", TOK_BUTTONMIN },
{ "Class", TOK_CLASS },
{ "Clock", TOK_CLOCK },
{ "ClockStyle", TOK_CLOCKSTYLE },
{ "Close", TOK_CLOSE },
{ "Corner", TOK_CORNER },
{ "DefaultIcon", TOK_DEFAULTICON },
{ "Desktop", TOK_DESKTOP },
{ "Desktops", TOK_DESKTOPS },
{ "Dock", TOK_DOCK },
{ "DoubleClickDelta", TOK_DOUBLECLICKDELTA },
{ "DoubleClickSpeed", TOK_DOUBLECLICKSPEED },
{ "Dynamic", TOK_DYNAMIC },
{ "Exit", TOK_EXIT },
{ "FocusModel", TOK_FOCUSMODEL },
{ "Font", TOK_FONT },
{ "Foreground", TOK_FOREGROUND },
{ "Group", TOK_GROUP },
{ "Height", TOK_HEIGHT },
{ "IconPath", TOK_ICONPATH },
{ "Include", TOK_INCLUDE },
{ "JWM", TOK_JWM },
{ "Key", TOK_KEY },
{ "Kill", TOK_KILL },
{ "Layer", TOK_LAYER },
{ "Machine", TOK_MACHINE },
{ "Maximize", TOK_MAXIMIZE },
{ "Menu", TOK_MENU },
{ "MenuStyle", TOK_MENUSTYLE },
{ "Minimize", TOK_MINIMIZE },
{ "Minimized", TOK_MINIMIZED },
{ "Mouse", TOK_MOUSE },
{ "Move", TOK_MOVE },
{ "MoveMode", TOK_MOVEMODE },
{ "Name", TOK_NAME },
{ "Opacity", TOK_OPACITY },
{ "Option", TOK_OPTION },
{ "Outline", TOK_OUTLINE },
{ "Pager", TOK_PAGER },
{ "PagerStyle", TOK_PAGERSTYLE },
{ "Popup", TOK_POPUP },
{ "PopupStyle", TOK_POPUPSTYLE },
{ "Program", TOK_PROGRAM },
{ "Resize", TOK_RESIZE },
{ "ResizeMode", TOK_RESIZEMODE },
{ "Restart", TOK_RESTART },
{ "RestartCommand", TOK_RESTARTCOMMAND },
{ "RootMenu", TOK_ROOTMENU },
{ "SendTo", TOK_SENDTO },
{ "Separator", TOK_SEPARATOR },
{ "Shade", TOK_SHADE },
{ "ShutdownCommand", TOK_SHUTDOWNCOMMAND },
{ "SnapMode", TOK_SNAPMODE },
{ "Spacer", TOK_SPACER },
{ "StartupCommand", TOK_STARTUPCOMMAND },
{ "Stick", TOK_STICK },
{ "Swallow", TOK_SWALLOW },
{ "TaskList", TOK_TASKLIST },
{ "TaskListStyle", TOK_TASKLISTSTYLE },
{ "Text", TOK_TEXT },
{ "Title", TOK_TITLE },
{ "TitleButtonOrder", TOK_TITLEBUTTONORDER },
{ "Tray", TOK_TRAY },
{ "TrayButton", TOK_TRAYBUTTON },
{ "TrayButtonStyle", TOK_TRAYBUTTONSTYLE },
{ "TrayStyle", TOK_TRAYSTYLE },
{ "Type", TOK_TYPE },
{ "Width", TOK_WIDTH },
{ "WindowStyle", TOK_WINDOWSTYLE }
{ "Active", TOK_ACTIVE },
{ "Background", TOK_BACKGROUND },
{ "Button", TOK_BUTTON },
{ "ButtonClose", TOK_BUTTONCLOSE },
{ "ButtonCloseFocus", TOK_BUTTONCLOSEFOCUS },
{ "ButtonMax", TOK_BUTTONMAX },
{ "ButtonMaxActive", TOK_BUTTONMAXACTIVE },
{ "ButtonMaxActiveFocus", TOK_BUTTONMAXACTIVEFOCUS },
{ "ButtonMaxFocus", TOK_BUTTONMAXFOCUS },
{ "ButtonMenu", TOK_BUTTONMENU },
{ "ButtonMenuFocus", TOK_BUTTONMENUFOCUS },
{ "ButtonMin", TOK_BUTTONMIN },
{ "ButtonMinFocus", TOK_BUTTONMINFOCUS },
{ "Class", TOK_CLASS },
{ "Clock", TOK_CLOCK },
{ "ClockStyle", TOK_CLOCKSTYLE },
{ "Close", TOK_CLOSE },
{ "Corner", TOK_CORNER },
{ "DefaultIcon", TOK_DEFAULTICON },
{ "Desktop", TOK_DESKTOP },
{ "Desktops", TOK_DESKTOPS },
{ "Dock", TOK_DOCK },
{ "DoubleClickDelta", TOK_DOUBLECLICKDELTA },
{ "DoubleClickSpeed", TOK_DOUBLECLICKSPEED },
{ "Dynamic", TOK_DYNAMIC },
{ "Exit", TOK_EXIT },
{ "FocusModel", TOK_FOCUSMODEL },
{ "Font", TOK_FONT },
{ "Foreground", TOK_FOREGROUND },
{ "Group", TOK_GROUP },
{ "Height", TOK_HEIGHT },
{ "IconPath", TOK_ICONPATH },
{ "Include", TOK_INCLUDE },
{ "JWM", TOK_JWM },
{ "Key", TOK_KEY },
{ "Kill", TOK_KILL },
{ "Layer", TOK_LAYER },
{ "Machine", TOK_MACHINE },
{ "Maximize", TOK_MAXIMIZE },
{ "Menu", TOK_MENU },
{ "MenuStyle", TOK_MENUSTYLE },
{ "Minimize", TOK_MINIMIZE },
{ "Minimized", TOK_MINIMIZED },
{ "Mouse", TOK_MOUSE },
{ "Move", TOK_MOVE },
{ "MoveMode", TOK_MOVEMODE },
{ "Name", TOK_NAME },
{ "Opacity", TOK_OPACITY },
{ "Option", TOK_OPTION },
{ "Outline", TOK_OUTLINE },
{ "Pager", TOK_PAGER },
{ "PagerStyle", TOK_PAGERSTYLE },
{ "Popup", TOK_POPUP },
{ "PopupStyle", TOK_POPUPSTYLE },
{ "Program", TOK_PROGRAM },
{ "Resize", TOK_RESIZE },
{ "ResizeMode", TOK_RESIZEMODE },
{ "Restart", TOK_RESTART },
{ "RestartCommand", TOK_RESTARTCOMMAND },
{ "RootMenu", TOK_ROOTMENU },
{ "SendTo", TOK_SENDTO },
{ "Separator", TOK_SEPARATOR },
{ "Shade", TOK_SHADE },
{ "ShutdownCommand", TOK_SHUTDOWNCOMMAND },
{ "SnapMode", TOK_SNAPMODE },
{ "Spacer", TOK_SPACER },
{ "StartupCommand", TOK_STARTUPCOMMAND },
{ "Stick", TOK_STICK },
{ "Swallow", TOK_SWALLOW },
{ "TaskList", TOK_TASKLIST },
{ "TaskListStyle", TOK_TASKLISTSTYLE },
{ "Text", TOK_TEXT },
{ "Title", TOK_TITLE },
{ "TitleButtonOrder", TOK_TITLEBUTTONORDER },
{ "Tray", TOK_TRAY },
{ "TrayButton", TOK_TRAYBUTTON },
{ "TrayButtonStyle", TOK_TRAYBUTTONSTYLE },
{ "TrayStyle", TOK_TRAYSTYLE },
{ "Type", TOK_TYPE },
{ "Width", TOK_WIDTH },
{ "WindowStyle", TOK_WINDOWSTYLE }
};
static const unsigned int TOKEN_MAP_COUNT = ARRAY_LENGTH(TOKEN_MAP);

Expand Down
Loading