Fix segmentation fault
This commit is contained in:
parent
7c828b413e
commit
e60134edd0
|
@ -126,7 +126,6 @@ drawmenu(void)
|
||||||
int modeWidth = 0;
|
int modeWidth = 0;
|
||||||
int larrowWidth = 0;
|
int larrowWidth = 0;
|
||||||
int rarrowWidth = 0;
|
int rarrowWidth = 0;
|
||||||
int itemWidth = 0;
|
|
||||||
|
|
||||||
if (!hidemode) modeWidth = pango_mode ? TEXTWM(modetext) : TEXTW(modetext);
|
if (!hidemode) modeWidth = pango_mode ? TEXTWM(modetext) : TEXTW(modetext);
|
||||||
if (!hidelarrow) larrowWidth = pango_leftarrow ? TEXTWM(leftarrow) : TEXTW(leftarrow);
|
if (!hidelarrow) larrowWidth = pango_leftarrow ? TEXTWM(leftarrow) : TEXTW(leftarrow);
|
||||||
|
@ -195,8 +194,6 @@ drawmenu(void)
|
||||||
x += inputw;
|
x += inputw;
|
||||||
w = larrowWidth;
|
w = larrowWidth;
|
||||||
|
|
||||||
itemWidth = pango_item ? TEXTWM(item->text) : TEXTW(item->text);
|
|
||||||
|
|
||||||
if (curr->left && !hidelarrow) {
|
if (curr->left && !hidelarrow) {
|
||||||
drw_setscheme(drw, scheme[SchemeLArrow]);
|
drw_setscheme(drw, scheme[SchemeLArrow]);
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, leftarrow, 0, pango_leftarrow ? True : False);
|
drw_text(drw, x, 0, w, bh, lrpad / 2, leftarrow, 0, pango_leftarrow ? True : False);
|
||||||
|
@ -205,7 +202,7 @@ drawmenu(void)
|
||||||
x += w;
|
x += w;
|
||||||
|
|
||||||
for (item = curr; item != next; item = item->right)
|
for (item = curr; item != next; item = item->right)
|
||||||
x = drawitem(item, x, 0, MIN(itemWidth, mw - x - rarrowWidth - numberWidth - modeWidth));
|
x = drawitem(item, x, 0, MIN(pango_item ? TEXTWM(item->text) : TEXTW(item->text), mw - x - rarrowWidth - numberWidth - modeWidth));
|
||||||
|
|
||||||
if (next && !hiderarrow) {
|
if (next && !hiderarrow) {
|
||||||
w = rarrowWidth;
|
w = rarrowWidth;
|
||||||
|
|
Loading…
Reference in a new issue