qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stash wmname into conf.

Browse Source
This commit is contained in:
okan 2016-10-05 13:10:59 +00:00
parent c42b7d0a28
commit ddbad284c7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cwm/calmwm.h
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: calmwm.h,v 1.324 2016/10/04 20:15:55 okan Exp $ * $OpenBSD: calmwm.h,v 1.325 2016/10/05 13:10:59 okan Exp $
*/ */
#ifndef _CALMWM_H_ #ifndef _CALMWM_H_
@ -41,7 +41,6 @@
#endif #endif
#define CONFFILE ".cwmrc" #define CONFFILE ".cwmrc"
#define WMNAME "CWM"
#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
#define MOUSEMASK (BUTTONMASK | PointerMotionMask) #define MOUSEMASK (BUTTONMASK | PointerMotionMask)
@ -290,6 +289,7 @@ struct conf {
char *color[CWM_COLOR_NITEMS]; char *color[CWM_COLOR_NITEMS];
char known_hosts[PATH_MAX]; char known_hosts[PATH_MAX];
char *font; char *font;
char *wmname;
Cursor cursor[CF_NITEMS]; Cursor cursor[CF_NITEMS];
}; };

4
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: conf.c,v 1.212 2016/10/04 15:52:32 okan Exp $ * $OpenBSD: conf.c,v 1.213 2016/10/05 13:10:59 okan Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -283,6 +283,7 @@ conf_init(struct conf *c)
homedir, ".ssh/known_hosts"); homedir, ".ssh/known_hosts");
c->font = xstrdup("sans-serif:pixelsize=14:bold"); c->font = xstrdup("sans-serif:pixelsize=14:bold");
c->wmname = xstrdup("CWM");
} }
void void
@ -327,6 +328,7 @@ conf_clear(struct conf *c)
free(c->color[i]); free(c->color[i]);
free(c->font); free(c->font);
free(c->wmname);
} }
void void

6
app/cwm/xutil.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: xutil.c,v 1.107 2016/10/04 15:18:20 okan Exp $ * $OpenBSD: xutil.c,v 1.108 2016/10/05 13:10:59 okan Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -115,8 +115,8 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc)
XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK], XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK],
XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1); XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1);
XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME], XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME],
cwmh[UTF8_STRING], 8, PropModeReplace, (unsigned char *)WMNAME, cwmh[UTF8_STRING], 8, PropModeReplace,
strlen(WMNAME)); (unsigned char *)Conf.wmname, strlen(Conf.wmname));
} }
void void