commit 3d7d098d25bd0059017084f90089a18c5f7b050f
parent fac0a361f533141e185e7afe810713c16e40fef2
Author: Anselm R. Garbe <arg@10kloc.org>
Date: Thu, 28 Sep 2006 13:20:41 +0200
prepared liblitz removal
Diffstat:
4 files changed, 251 insertions(+), 12 deletions(-)
diff --git a/cmd/wm/column.c b/cmd/wm/column.c
@@ -336,10 +336,10 @@ frame_of_point(XPoint *pt)
if(!v)
return nil;
- for(a=v->area->next; a && !blitz_ispointinrect(pt->x, pt->y, &a->rect);
+ for(a=v->area->next; a && !ispointinrect(pt->x, pt->y, &a->rect);
a=a->next);
if(a)
- for(f=a->frame; f && !blitz_ispointinrect(pt->x, pt->y, &f->rect);
+ for(f=a->frame; f && !ispointinrect(pt->x, pt->y, &f->rect);
f=f->anext);
return f;
}
@@ -358,7 +358,7 @@ drop_move(Frame *f, XRectangle *new, XPoint *pt)
if(!pt)
return;
- for(tgt=v->area->next; tgt && !blitz_ispointinrect(pt->x, pt->y, &tgt->rect);
+ for(tgt=v->area->next; tgt && !ispointinrect(pt->x, pt->y, &tgt->rect);
tgt=tgt->next);
if(tgt) {
if(pt->x < 16) {
diff --git a/cmd/wm/draw.c b/cmd/wm/draw.c
@@ -0,0 +1,210 @@
+/*
+ * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details.
+ */
+#include "wm.h"
+#include <stdio.h>
+#include <string.h>
+#include <X11/Xlocale.h>
+
+/* static */
+
+static unsigned int
+textnw(const char *text, unsigned int len) {
+ XRectangle r;
+
+ if(dc.font.set) {
+ XmbTextExtents(dc.font.set, text, len, NULL, &r);
+ return r.width;
+ }
+ return XTextWidth(dc.font.xfont, text, len);
+}
+
+static void
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
+ int x, y, w, h;
+ static char buf[256];
+ unsigned int len, olen;
+ XGCValues gcv;
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+ XSetForeground(dpy, dc.gc, col[ColBG]);
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+
+ if(!text)
+ return;
+
+ w = 0;
+ olen = len = strlen(text);
+ if(len >= sizeof(buf))
+ len = sizeof(buf) - 1;
+ memcpy(buf, text, len);
+ buf[len] = 0;
+
+ h = dc.font.ascent + dc.font.descent;
+ y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+ x = dc.x + (h / 2);
+
+ /* shorten text if necessary */
+ while(len && (w = textnw(buf, len)) > dc.w - h)
+ buf[--len] = 0;
+ if(len < olen) {
+ if(len > 1)
+ buf[len - 1] = '.';
+ if(len > 2)
+ buf[len - 2] = '.';
+ if(len > 3)
+ buf[len - 3] = '.';
+ }
+
+ if(w > dc.w)
+ return; /* too long */
+ gcv.foreground = col[ColFG];
+ if(dc.font.set) {
+ XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+ XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+ }
+ else {
+ gcv.font = dc.font.xfont->fid;
+ XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+ }
+ if(highlight) {
+ r.x = dc.x + 2;
+ r.y = dc.y + 2;
+ r.width = r.height = 3;
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ }
+}
+
+/* extern */
+
+void
+drawall(void) {
+ Client *c;
+
+ for(c = clients; c; c = getnext(c->next))
+ drawtitle(c);
+ drawstatus();
+}
+
+void
+drawstatus(void) {
+ int i, x;
+
+ dc.x = dc.y = 0;
+
+ for(i = 0; i < ntags; i++) {
+ dc.w = textw(tags[i]);
+ if(seltag[i])
+ drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+ else
+ drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+ dc.x += dc.w;
+ }
+
+ dc.w = bmw;
+ drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
+
+ x = dc.x + dc.w;
+ dc.w = textw(stext);
+ dc.x = bx + bw - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = bw - x;
+ }
+ drawtext(stext, dc.status, False);
+
+ if((dc.w = dc.x - x) > bh) {
+ dc.x = x;
+ if(sel)
+ drawtext(sel->name, dc.sel, False);
+ else
+ drawtext(NULL, dc.norm, False);
+ }
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+ XSync(dpy, False);
+}
+
+void
+drawtitle(Client *c) {
+ if(c == sel && issel) {
+ drawstatus();
+ XUnmapWindow(dpy, c->twin);
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+ return;
+ }
+
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+ XMapWindow(dpy, c->twin);
+ dc.x = dc.y = 0;
+ dc.w = c->tw;
+ drawtext(c->name, dc.norm, False);
+ XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+ XSync(dpy, False);
+}
+
+unsigned long
+getcolor(const char *colstr) {
+ Colormap cmap = DefaultColormap(dpy, screen);
+ XColor color;
+
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+ eprint("error, cannot allocate color '%s'\n", colstr);
+ return color.pixel;
+}
+
+void
+setfont(const char *fontstr) {
+ char **missing, *def;
+ int i, n;
+
+ missing = NULL;
+ setlocale(LC_ALL, "");
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(missing) {
+ while(n--)
+ fprintf(stderr, "missing fontset: %s\n", missing[n]);
+ XFreeStringList(missing);
+ if(dc.font.set) {
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = NULL;
+ }
+ }
+ if(dc.font.set) {
+ XFontSetExtents *font_extents;
+ XFontStruct **xfonts;
+ char **font_names;
+
+ dc.font.ascent = dc.font.descent = 0;
+ font_extents = XExtentsOfFontSet(dc.font.set);
+ n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+ for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+ if(dc.font.ascent < (*xfonts)->ascent)
+ dc.font.ascent = (*xfonts)->ascent;
+ if(dc.font.descent < (*xfonts)->descent)
+ dc.font.descent = (*xfonts)->descent;
+ xfonts++;
+ }
+ }
+ else {
+ if(dc.font.xfont)
+ XFreeFont(dpy, dc.font.xfont);
+ dc.font.xfont = NULL;
+ dc.font.xfont = XLoadQueryFont(dpy, fontstr);
+ if (!dc.font.xfont)
+ dc.font.xfont = XLoadQueryFont(dpy, "fixed");
+ if (!dc.font.xfont)
+ eprint("error, cannot init 'fixed' font\n");
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
+ }
+ dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
+unsigned int
+textw(const char *text) {
+ return textnw(text, strlen(text)) + dc.font.height;
+}
diff --git a/cmd/wm/geom.c b/cmd/wm/geom.c
@@ -7,6 +7,13 @@
#include "wm.h"
+Bool
+ispointinrect(int x, int y, XRectangle * r)
+{
+ return (x >= r->x) && (x <= r->x + r->width)
+ && (y >= r->y) && (y <= r->y + r->height);
+}
+
BlitzAlign
quadofcoord(XRectangle *rect, int x, int y)
{
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -13,15 +13,10 @@
/* WM atoms */
enum { WMProtocols, WMDelete, WMLast };
-
-/* NET atoms */
-enum { NetSupported, NetWMName, NetLast };
-
-/* Column modes */
-enum { Coldefault, Colstack, Colmax };
-
-/* Cursor */
-enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
+enum { NetSupported, NetWMName, NetLast }; /* NET atoms */
+enum { Coldefault, Colstack, Colmax }; /* Column modes */
+enum { ColFG, ColBG, ColLast }; /* color */
+enum { CurNormal, CurResize, CurMove, CurInput, CurLast }; /* Cursor */
enum { NCOL = 16 };
enum { WM_PROTOCOL_DELWIN = 1 };
@@ -37,6 +32,24 @@ typedef struct Rule Rule;
typedef struct Ruleset Ruleset;
typedef struct WMScreen WMScreen;
+typedef struct {
+ int ascent;
+ int descent;
+ int height;
+ XFontSet set;
+ XFontStruct *xfont;
+} Fnt;
+
+typedef struct {
+ int x, y, w, h;
+ unsigned long norm[ColLast];
+ unsigned long sel[ColLast];
+ unsigned long status[ColLast];
+ Drawable drawable;
+ Fnt font;
+ GC gc;
+} DC; /* draw context */
+
struct View {
View *next;
char name[256];
@@ -238,6 +251,14 @@ extern int column_mode_of_str(char *arg);
extern char *str_of_column_mode(int mode);
extern Area *new_column(View *v, Area *pos, unsigned int w);
+/* draw.c */
+extern void drawall(void); /* draw all visible client titles and the bar */
+extern void drawstatus(void); /* draw the bar */
+extern void drawtitle(Client *c); /* draw title of c */
+extern unsigned long getcolor(const char *colstr); /* return color of colstr */
+extern void setfont(const char *fontstr); /* set the font for DC */
+extern unsigned int textw(const char *text); /* return the width of text in px*/
+
/* event.c */
extern void check_x_event(IXPConn *c);
extern unsigned int flush_masked_events(long even_mask);
@@ -265,6 +286,7 @@ extern void fs_write(P9Req *r);
extern void write_event(char *format, ...);
/* geom.c */
+extern Bool ispointinrect(int x, int y, XRectangle * r);
extern BlitzAlign quadofcoord(XRectangle *rect, int x, int y);
extern int strtorect(XRectangle *r, const char *val);
