added configuration options for issue #585 (kill menu, client name in title)

jwm.1.in

@@ -1074,14 +1074,26 @@ that the value is relative to the bottom of the screen.
 .B "WINDOW STYLE"
 .RS
 The \fBWindowStyle\fP tag controls the look of window borders.
-This tag supports the following attribute:
+This tag supports the following attributes:
 .P
 .B decorations
 .RS
 The window decorations to use. Valid options are \fBflat\fP and
 \fBmotif\fP. \fBflat\fP is the default.
 .RE
 .P
+.B machinename
+.RS
+Include the X client machine name (WM_CLIENT_MACHINE) in the window title.
+Valid options are \fBtrue\fP and \fBfalse\fP. \fBfalse\fP is the default.
+.RE
+.P
+.B delimiters
+.RS
+The two characters used to wrap the X client machine name in the window title.
+The default characters are \fB()\fP.
+.RE
+.P
 Within this tag, the following tags are supported:
 .P
 .B Font
@@ -1257,7 +1269,7 @@ respectively.
 .B "TASK LIST STYLE"
 .RS
 The \fBTaskListStyle\fP tag controls the look of task lists.
-The following attributea are supported:
+The following attributes are supported:
 .P
 .B decorations
 .RS
@@ -1279,6 +1291,13 @@ Possible values are \fBdesktop\fP and \fBall\fP. The default
 is \fBdesktop\fP.
 .RE
 .P
+.B killmenu
+.RS
+Determines if the \fBKill\fP popup menu item is shown on task bars and
+window title bars. Possible values are \fBtrue\fP and \fBfalse\fP. The default
+is \fBtrue\fP.
+.RE
+.P
 Within this tag the following tags are supported:
 .P
 .B Font

src/border.c

@@ -451,7 +451,17 @@ void DrawBorderHelper(const ClientNode *np)
       if(np->name && np->name[0] && point.x < point.y) {
          unsigned titleWidth = point.y - point.x;
          const int sheight = GetStringHeight(FONT_BORDER);
-         const int textWidth = GetStringWidth(FONT_BORDER, np->name);
+         const int buffSize = (MAX_TITLE_LENGTH+1)*sizeof(char);
+         char *titleBuffer = calloc(MAX_TITLE_LENGTH+1,sizeof(char));
+         titleBuffer = memset(titleBuffer,'\0',buffSize);
+         if (settings.showMachineName){
+             sprintf(titleBuffer,"%s %c%s%c",np->name,
+                     settings.machineNameDelimiters[0],np->machineName,
+                     settings.machineNameDelimiters[1]);
+         } else {
+             sprintf(titleBuffer,"%s",np->name);
+         }
+         const int textWidth = GetStringWidth(FONT_BORDER,titleBuffer);
          unsigned titlex, titley;
          int xoffset = 0;
 
@@ -474,7 +484,8 @@ void DrawBorderHelper(const ClientNode *np)
             titley += south - 1;
          }
          RenderString(canvas, FONT_BORDER, borderTextColor,
-                      titlex, titley, titleWidth, np->name);
+                      titlex, titley, titleWidth, titleBuffer);
+         free(titleBuffer);
       }
 
    }

src/parse.c

@@ -160,6 +160,9 @@ static const char *DYNAMIC_ATTRIBUTE = "dynamic";
 static const char *SPACING_ATTRIBUTE = "spacing";
 static const char *TIMEOUT_ATTRIBUTE = "timeout";
 static const char *POPUP_ATTRIBUTE = "popup";
+static const char *MACHINENAME_ATTRIBUTE = "machinename";
+static const char *MN_DELIMITERS_ATTRIBUTE = "delimiters";
+static const char *KILL_MENU_ATTRIBUTE = "killmenu";
 
 static const char *FALSE_VALUE = "false";
 static const char *TRUE_VALUE = "true";
@@ -998,6 +1001,19 @@ void ParseWindowStyle(const TokenNode *tp)
 {
    const TokenNode *np;
 
+   const char *temp;
+   temp = FindAttribute(tp->attributes, MACHINENAME_ATTRIBUTE);
+   if(temp){
+        settings.showMachineName = !strcmp(temp,TRUE_VALUE);
+   }
+
+   temp = FindAttribute(tp->attributes, MN_DELIMITERS_ATTRIBUTE);
+   if(temp && strlen(temp)>=2) {
+      char *delims = calloc(strlen(temp)+1,sizeof(char));
+      sprintf(delims,"%s",temp);
+      settings.machineNameDelimiters = delims;
+   }
+
    ParseDecorations(tp, &settings.windowDecorations);
    for(np = tp->subnodeHead; np; np = np->next) {
       switch(np->type) {
@@ -1203,6 +1219,12 @@ void ParseTrayStyle(const TokenNode *tp, FontType font, ColorType fg)
       if(temp) {
          settings.listAllTasks = !strcmp(temp, "all");
       }
+
+      temp = FindAttribute(tp->attributes, KILL_MENU_ATTRIBUTE);
+      if(temp) {
+         settings.showKillMenuItem = !strcmp(temp, TRUE_VALUE);
+      }
+
    } else if(tp->type == TOK_TRAYSTYLE) {
       ParseDecorations(tp, &settings.trayDecorations);
    }

src/settings.c

@@ -61,6 +61,9 @@ void InitializeSettings(void)
    settings.groupTasks = 0;
    settings.listAllTasks = 0;
    settings.dockSpacing = 0;
+   settings.showMachineName = 0;
+   settings.machineNameDelimiters = DEFAULT_MACHINE_NAME_DELIMITERS;
+   settings.showKillMenuItem = 1;
    memcpy(settings.titleBarLayout, DEFAULT_TITLE_BAR_LAYOUT,
       sizeof(settings.titleBarLayout));
 }

src/settings.h

@@ -84,10 +84,15 @@ typedef unsigned char DesktopBackAndForthType;
 #define DBACKANDFORTH_OFF 0 /**< No back and forth */
 #define DBACKANDFORTH_ON  1 /**< Enable back and forth */
 
-/** Maximimum number of title bar components
+/** Maximum number of title bar components
  * For now, we allow each component to be used twice. */
 #define TBC_COUNT       9
 
+/** Maximum number of characters in window title 
+ * and default characters for machine name delimiters. */
+#define MAX_TITLE_LENGTH                   512
+#define DEFAULT_MACHINE_NAME_DELIMITERS    "()"
+
 /** Settings. */
 typedef struct {
    unsigned doubleClickSpeed;
@@ -122,6 +127,9 @@ typedef struct {
    MouseContextType titleBarLayout[TBC_COUNT + 1];
    char groupTasks;
    char listAllTasks;
+   char showMachineName;
+   char *machineNameDelimiters;
+   char showKillMenuItem;
    DesktopBackAndForthType desktopBackAndForth;
 } Settings;
 

src/winmenu.c

@@ -46,7 +46,9 @@ Menu *CreateWindowMenu(ClientNode *np)
 
    if(!(np->state.status & STAT_WMDIALOG)) {
       AddWindowMenuItem(menu, _("Close"), MA_CLOSE, np, 0);
-      AddWindowMenuItem(menu, _("Kill"), MA_KILL, np, 0);
+      if (settings.showKillMenuItem){
+          AddWindowMenuItem(menu, _("Kill"), MA_KILL, np, 0);
+      }
       AddWindowMenuItem(menu, NULL, MA_NONE, np, 0);
    }