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

move the rest of xft init into screen_conf, since most of it is based on

Browse Source 
config parameters.
This commit is contained in:
okan 2013-05-19 23:16:29 +00:00
parent 9baf72c106
commit f3337f150c
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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.203 2013/05/19 23:09:59 okan Exp $ * $OpenBSD: calmwm.h,v 1.204 2013/05/19 23:16:29 okan Exp $
*/ */
#ifndef _CALMWM_H_ #ifndef _CALMWM_H_
@ -446,7 +446,6 @@ void conf_ungrab(struct conf *, struct keybinding *);
void font_draw(struct screen_ctx *, const char *, void font_draw(struct screen_ctx *, const char *,
Drawable, int, int, int); Drawable, int, int, int);
void font_init(struct screen_ctx *, const char *);
int font_width(XftFont *, const char *, int); int font_width(XftFont *, const char *, int);
void xev_loop(void); void xev_loop(void);

11
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.127 2013/05/19 23:09:59 okan Exp $ * $OpenBSD: conf.c,v 1.128 2013/05/19 23:16:29 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -103,7 +103,14 @@ conf_screen(struct screen_ctx *sc)
sc->gap = Conf.gap; sc->gap = Conf.gap;
font_init(sc, Conf.font); sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin,
sc->visual, sc->colormap);
if (sc->xftdraw == NULL)
errx(1, "XftDrawCreate");
sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font);
if (sc->xftfont == NULL)
errx(1, "XftFontOpenName");
for (i = 0; i < CWM_COLOR_MAX; i++) { for (i = 0; i < CWM_COLOR_MAX; i++) {
if (*Conf.color[i] == '\0') if (*Conf.color[i] == '\0')

15
app/cwm/font.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: font.c,v 1.27 2013/05/19 23:09:59 okan Exp $ * $OpenBSD: font.c,v 1.28 2013/05/19 23:16:29 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -30,19 +30,6 @@
#include "calmwm.h" #include "calmwm.h"
void
font_init(struct screen_ctx *sc, const char *name)
{
sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin,
sc->visual, sc->colormap);
if (sc->xftdraw == NULL)
errx(1, "XftDrawCreate");
sc->xftfont = XftFontOpenName(X_Dpy, sc->which, name);
if (sc->xftfont == NULL)
errx(1, "XftFontOpenName");
}
int int
font_width(XftFont *xftfont, const char *text, int len) font_width(XftFont *xftfont, const char *text, int len)
{ {