Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add align commands (left, center, right) #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add align commands (left, center, right) #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions README.dzen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,23 @@ Positioning:
a.k.a. absolute positioning
For maximum predictability ^^pa() should only be
used with '-ta l' or '-sa l'

^^left() Align next input to left. Reset settings (fg, bg, fn, etc)
^^center() Align next input to center. Reset settings (fg, bg, fn, etc)
^^right() Align next input to rigth. Reset settings (fg, bg, fn, etc)
Example:
^^left()^^fg(red)Left ^^center()^^fg(green)Center ^^right()^^fg(blue)Right
Giving:
^left()^fg(red)Left ^center()^fg(green)Center ^right()^fg(blue)Right


Other:
------

^^tw() draw to title window
This command has some annoyances, as only
This command has some annoyances, as only
the input after the command will be drawn
to the title window, so it is best used
to the title window, so it is best used
only once and as first command per line
Subject to be improved in the future.

Expand Down
80 changes: 59 additions & 21 deletions draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ icon_c icons[MAX_ICON_CACHE];
int icon_cnt;
int otx;

int xorig[2];
sens_w window_sens[2];

/* command types for the in-text parser */
enum ctype {bg, fg, icon, rect, recto, circle, circleo, pos, abspos, titlewin, ibg, fn, fixpos, ca, ba};
enum ctype {bg, fg, icon, rect, recto, circle, circleo, pos, abspos, titlewin, ibg, fn, fixpos, ca, ba,
leftalign, centeralign, rightalign};

struct command_lookup {
const char *name;
Expand All @@ -59,6 +59,9 @@ struct command_lookup cmd_lookup_table[] = {
{ "fn(", fn, 3},
{ "ca(", ca, 3},
{ "ba(", ba, 3},
{ "left(", leftalign, 5},
{ "right(", rightalign, 6},
{ "center(", centeralign,7},
{ 0, 0, 0}
};

Expand Down Expand Up @@ -373,6 +376,8 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
int block_width = -1;
/* clickable area y tracking */
int max_y=-1;
/* Last max drawn pixel */
int max_x=0;

/* temp buffers */
char lbuf[MAX_LINE_LEN], *rbuf = NULL;
Expand Down Expand Up @@ -410,6 +415,13 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
/* icon cache */
int ip;

/* call parse_line with rest of the line and changed align: ALIGNLEFT, ALIGNCENTER, ALIGNRIGHT */
int next_align = -1;
/* parse_line can be called multiple times, need to change X position of sens are created in this call depending on align */
int sens_areas_start = window_sens[LNR2WINDOW(lnr)].sens_areas_cnt;

int xorig;

/* parse line and return the text without control commands */
if(nodraw) {
rbuf = emalloc(MAX_LINE_LEN);
Expand All @@ -424,8 +436,8 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
else {
h = dzen.font.height;
py = (dzen.line_height - h) / 2;
xorig[LNR2WINDOW(lnr)] = 0;
xorig = 0;

if(lnr != -1) {
pm = XCreatePixmap(dzen.dpy, RootWindow(dzen.dpy, DefaultScreen(dzen.dpy)), dzen.slave_win.width,
dzen.line_height, DefaultDepth(dzen.dpy, dzen.screen));
Expand Down Expand Up @@ -487,7 +499,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {

if( lnr != -1 && (lnr + dzen.slave_win.first_line_vis >= dzen.slave_win.tcnt)) {
XCopyArea(dzen.dpy, pm, dzen.slave_win.drawable[lnr], dzen.gc,
0, 0, px, dzen.line_height, xorig[LNR2WINDOW(lnr)], 0);
0, 0, px, dzen.line_height, xorig, 0);
XFreePixmap(dzen.dpy, pm);
return NULL;
}
Expand Down Expand Up @@ -515,6 +527,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
0, 0, icons[ip].w, icons[ip].h, px, y=(set_posy ? py :
(dzen.line_height >= (signed)icons[ip].h ?
(dzen.line_height - icons[ip].h)/2 : 0)));
max_x = MAX(max_x, px + icons[ip].w);
px += !pos_is_fixed ? icons[ip].w : 0;
max_y = MAX(max_y, y+icons[ip].h);
} else {
Expand All @@ -529,6 +542,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
(dzen.line_height >= (int)bm_h ?
(dzen.line_height - (int)bm_h)/2 : 0)), 1);
XFreePixmap(dzen.dpy, bm);
max_x = MAX(max_x, px + bm_w);
px += !pos_is_fixed ? bm_w : 0;
max_y = MAX(max_y, y+bm_h);
}
Expand All @@ -543,6 +557,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
0, 0, xpma.width, xpma.height, px, y=(set_posy ? py :
(dzen.line_height >= (int)xpma.height ?
(dzen.line_height - (int)xpma.height)/2 : 0)));
max_x = MAX(max_x, px + xpma.width);
px += !pos_is_fixed ? xpma.width : 0;
max_y = MAX(max_y, y+xpma.height);

Expand All @@ -562,6 +577,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
py += recty;
recty = recty == 0 ? (dzen.line_height - recth)/2 :
(dzen.line_height - recth)/2 + recty;
max_x = MAX(max_x, px + rectx + rectw);
px += !pos_is_fixed ? rectx : 0;
setcolor(&pm, px, rectw, lastfg, lastbg, reverse, nobg);

Expand All @@ -582,6 +598,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
py += recty;
recty = recty == 0 ? (dzen.line_height - recth)/2 :
(dzen.line_height - recth)/2 + recty;
max_x = MAX(max_x, px + rectx + rectw);
px = (rectx == 0) ? px : rectx+px;
/* prevent from stairs effect when rounding recty */
if (!((dzen.line_height - recth) % 2)) recty--;
Expand All @@ -597,6 +614,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
setcolor(&pm, px, rectw, lastfg, lastbg, reverse, nobg);
XFillArc(dzen.dpy, pm, dzen.tgc, px, set_posy ? py :(dzen.line_height - rectw)/2,
rectw, rectw, 90*64, rectx>1?recth*64:64*360);
max_x = MAX(max_x, px + rectw);
px += !pos_is_fixed ? rectw : 0;
break;

Expand All @@ -605,6 +623,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
setcolor(&pm, px, rectw, lastfg, lastbg, reverse, nobg);
XDrawArc(dzen.dpy, pm, dzen.tgc, px, set_posy ? py : (dzen.line_height - rectw)/2,
rectw, rectw, 90*64, rectx>1?recth*64:64*360);
max_x = MAX(max_x, px + rectw);
px += !pos_is_fixed ? rectw : 0;
break;

Expand Down Expand Up @@ -645,12 +664,13 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {

if(r != 2)
px = px+n_posx<0? 0 : px + n_posx;
if(r != 1)
if(r != 1)
py += n_posy;
} else {
set_posy = 0;
py = (dzen.line_height - dzen.font.height) / 2;
}
max_x = MAX(max_x, px);
break;

case abspos:
Expand All @@ -670,6 +690,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
set_posy = 0;
py = (dzen.line_height - dzen.font.height) / 2;
}
max_x = MAX(max_x, px);
break;

case ibg:
Expand Down Expand Up @@ -797,10 +818,10 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
px += (block_width - tw);
else if(block_align==ALIGNCENTER)
px += (block_width/2) - (tw/2);

max_x = MAX(max_x, px);
if(!nobg)
setcolor(&pm, px, tw, lastfg, lastbg, reverse, nobg);

#ifndef DZEN_XFT
if(cur_fnt->set)
XmbDrawString(dzen.dpy, pm, cur_fnt->set,
Expand Down Expand Up @@ -833,15 +854,17 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
max_y = MAX(max_y, py+dzen.font.height);

if(block_align==-1) {
if(!pos_is_fixed || *linep =='\0')
if(!pos_is_fixed || *linep =='\0') {
px += tw;
max_x = MAX(max_x, px);
}
} else {
if(pos_is_fixed)
px = opx;
else
px = opx+block_width;
max_x = MAX(max_x, px);
}

block_align=block_width=-1;
}

Expand All @@ -851,6 +874,16 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
j=0; t=-1; tval=NULL;
next_pos = get_token(linep, &t, &tval);
linep += next_pos;
if (t == leftalign) {
next_align = ALIGNLEFT;
break;
} else if (t == centeralign) {
next_align = ALIGNCENTER;
break;
} else if (t == rightalign) {
next_align = ALIGNRIGHT;
break;
}

/* ^^ escapes */
if(next_pos == 0)
Expand Down Expand Up @@ -880,28 +913,22 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {

} else {
if(align == ALIGNLEFT)
xorig[LNR2WINDOW(lnr)] = 0;
xorig = 0;
if(align == ALIGNCENTER) {
xorig[LNR2WINDOW(lnr)] = (lnr != -1) ?
xorig = (lnr != -1) ?
(dzen.slave_win.width - px)/2 :
(dzen.title_win.width - px)/2;
}
else if(align == ALIGNRIGHT) {
xorig[LNR2WINDOW(lnr)] = (lnr != -1) ?
xorig = (lnr != -1) ?
(dzen.slave_win.width - px) :
(dzen.title_win.width - px);
}
}


if(lnr != -1) {
XCopyArea(dzen.dpy, pm, dzen.slave_win.drawable[lnr], dzen.gc,
0, 0, dzen.w, dzen.line_height, xorig[LNR2WINDOW(lnr)], 0);
}
else {
XCopyArea(dzen.dpy, pm, dzen.title_win.drawable, dzen.gc,
0, 0, dzen.w, dzen.line_height, xorig[LNR2WINDOW(lnr)], 0);
}
XCopyArea(dzen.dpy, pm, (lnr != -1 ? dzen.slave_win.drawable[lnr] : dzen.title_win.drawable), dzen.gc,
0, 0, max_x, dzen.line_height, xorig, 0);
XFreePixmap(dzen.dpy, pm);

/* reset font to default */
Expand All @@ -920,6 +947,17 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
#endif
}

sens_w *w = &window_sens[LNR2WINDOW(lnr)];
for(i=sens_areas_start; i<(*w).sens_areas_cnt; i++) {
(*w).sens_areas[i].start_x += xorig;
(*w).sens_areas[i].end_x += xorig;
}

if (!nodraw && next_align != -1) {
/* linep */
return parse_line(linep + 1, lnr, next_align, reverse, 0);
}

return nodraw ? rbuf : NULL;
}

Expand Down
1 change: 0 additions & 1 deletion dzen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ typedef struct _SENS_PER_WINDOW {
} sens_w;

//0: top window, 1: slave window
extern int xorig[2];
extern sens_w window_sens[2];


Expand Down
4 changes: 2 additions & 2 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,8 @@ handle_xev(void) {
for(i=w.sens_areas_cnt; i>=0; i--) {
if(ev.xbutton.window == w.sens_areas[i].win &&
ev.xbutton.button == w.sens_areas[i].button &&
(ev.xbutton.x >= w.sens_areas[i].start_x+xorig[w_id] &&
ev.xbutton.x <= w.sens_areas[i].end_x+xorig[w_id]) &&
(ev.xbutton.x >= w.sens_areas[i].start_x &&
ev.xbutton.x <= w.sens_areas[i].end_x) &&
(ev.xbutton.y >= w.sens_areas[i].start_y &&
ev.xbutton.y <= w.sens_areas[i].end_y) &&
w.sens_areas[i].active) {
Expand Down