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

struct XftFont already has height which we can use directly instead of

Browse Source 
calculating ourselves, so do so.

ok oga@
This commit is contained in:
okan 2011-06-24 05:45:57 +00:00
parent 08f0ea6df6
commit 74252c7d0a
4 changed files with 8 additions and 11 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
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: calmwm.h,v 1.128 2011/06/24 05:40:09 okan Exp $
* $OpenBSD: calmwm.h,v 1.129 2011/06/24 05:45:57 okan Exp $
*/
#ifndef _CALMWM_H_
@ -207,7 +207,6 @@ struct screen_ctx {
XftColor xftcolor;
XftDraw *xftdraw;
XftFont *font;
u_int fontheight;
int xinerama_no;
XineramaScreenInfo *xinerama;
#define CALMWM_NGROUPS 9

3
app/cwm/conf.c
View File

@ -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.81 2011/06/24 05:40:09 okan Exp $
* $OpenBSD: conf.c,v 1.82 2011/06/24 05:45:57 okan Exp $
*/
#include <sys/param.h>
@ -70,7 +70,6 @@ void
conf_font(struct conf *c, struct screen_ctx *sc)
{
sc->font = font_make(sc, c->DefaultFontName);
sc->fontheight = font_ascent(sc) + font_descent(sc) + 1;
}
void

4
app/cwm/font.c
View File

@ -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: font.c,v 1.14 2011/05/11 13:53:51 okan Exp $
* $OpenBSD: font.c,v 1.15 2011/06/24 05:45:57 okan Exp $
*/
#include <sys/param.h>
@ -45,7 +45,7 @@ font_descent(struct screen_ctx *sc)
u_int
font_height(struct screen_ctx *sc)
{
return (sc->fontheight);
return (sc->font->height + 1);
}
void

9
app/cwm/mousefunc.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: mousefunc.c,v 1.26 2011/05/13 12:53:19 okan Exp $
* $OpenBSD: mousefunc.c,v 1.27 2011/06/24 05:45:57 okan Exp $
*/
#include <sys/param.h>
@ -55,7 +55,7 @@ mousefunc_sweep_draw(struct client_ctx *cc)
{
struct screen_ctx *sc = cc->sc;
char asize[10]; /* fits "nnnnxnnnn\0" */
int width, height, width_size, width_name;
int width, width_size, width_name;
snprintf(asize, sizeof(asize), "%dx%d",
(cc->geom.width - cc->geom.basew) / cc->geom.incw,
@ -63,17 +63,16 @@ mousefunc_sweep_draw(struct client_ctx *cc)
width_size = font_width(sc, asize, strlen(asize)) + 4;
width_name = font_width(sc, cc->name, strlen(cc->name)) + 4;
width = MAX(width_size, width_name);
height = font_ascent(sc) + font_descent(sc) + 1;
XMoveResizeWindow(X_Dpy, sc->menuwin, cc->geom.x, cc->geom.y,
width, height * 2);
width, font_height(sc) * 2);
XMapWindow(X_Dpy, sc->menuwin);
XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0);
XClearWindow(X_Dpy, sc->menuwin);
font_draw(sc, cc->name, strlen(cc->name), sc->menuwin,
2, font_ascent(sc) + 1);
font_draw(sc, asize, strlen(asize), sc->menuwin,
width / 2 - width_size / 2, height + font_ascent(sc) + 1);
width / 2 - width_size / 2, font_height(sc) + font_ascent(sc) + 1);
}
void