diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2016-10-05 13:11:00 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2016-10-05 13:11:00 +0000 |
| commit | 942155ff1ef3f11956038fcbd688cdc629b2507f (patch) | |
| tree | b1ea1b577b428d4d739bbc53b02297c12d6d2718 /app | |
| parent | 886fe7ea7ae347e1b2624acb77b47ec2fba2b6db (diff) | |
Stash wmname into conf.
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/calmwm.h | 4 | ||||
| -rw-r--r-- | app/cwm/conf.c | 4 | ||||
| -rw-r--r-- | app/cwm/xutil.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index dd81e7412..79656eb9a 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * 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_ @@ -41,7 +41,6 @@ #endif #define CONFFILE ".cwmrc" -#define WMNAME "CWM" #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) #define MOUSEMASK (BUTTONMASK | PointerMotionMask) @@ -290,6 +289,7 @@ struct conf { char *color[CWM_COLOR_NITEMS]; char known_hosts[PATH_MAX]; char *font; + char *wmname; Cursor cursor[CF_NITEMS]; }; diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 6b523fbfb..55ac921e2 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * 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> @@ -283,6 +283,7 @@ conf_init(struct conf *c) homedir, ".ssh/known_hosts"); c->font = xstrdup("sans-serif:pixelsize=14:bold"); + c->wmname = xstrdup("CWM"); } void @@ -327,6 +328,7 @@ conf_clear(struct conf *c) free(c->color[i]); free(c->font); + free(c->wmname); } void diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c index f1d66d6eb..31436f946 100644 --- a/app/cwm/xutil.c +++ b/app/cwm/xutil.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * 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> @@ -115,8 +115,8 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc) XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK], XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1); XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME], - cwmh[UTF8_STRING], 8, PropModeReplace, (unsigned char *)WMNAME, - strlen(WMNAME)); + cwmh[UTF8_STRING], 8, PropModeReplace, + (unsigned char *)Conf.wmname, strlen(Conf.wmname)); } void |