removed monsyms, useless
565050ac
2 file(s) · +3 −15
| 13 | 13 | static const Bool showbar = True; /* False means no bar */ |
|
| 14 | 14 | static const Bool topbar = True; /* False means bottom bar */ |
|
| 15 | 15 | ||
| 16 | - | /* monitor(s) symbols */ |
|
| 17 | - | static const char *monsyms[] = { "<1>", "<2>", "<3>", "<4>" }; |
|
| 18 | - | ||
| 19 | 16 | /* tagging */ |
|
| 20 | 17 | static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; |
|
| 21 | 18 |
| 123 | 123 | struct Monitor { |
|
| 124 | 124 | int screen_number; |
|
| 125 | 125 | float mfact; |
|
| 126 | - | int by, btx; /* bar geometry */ |
|
| 126 | + | int by; /* bar geometry */ |
|
| 127 | 127 | int mx, my, mw, mh; /* screen size */ |
|
| 128 | 128 | int wx, wy, ww, wh; /* window area */ |
|
| 129 | 129 | unsigned int seltags; |
|
| 409 | 409 | selmon = m; |
|
| 410 | 410 | focus(NULL); |
|
| 411 | 411 | } |
|
| 412 | - | if(ev->window == selmon->barwin && ev->x >= selmon->btx) { |
|
| 413 | - | i = 0; |
|
| 414 | - | x = selmon->btx; |
|
| 412 | + | if(ev->window == selmon->barwin) { |
|
| 413 | + | i = x = 0; |
|
| 415 | 414 | do |
|
| 416 | 415 | x += TEXTW(tags[i]); |
|
| 417 | 416 | while(ev->x >= x && ++i < LENGTH(tags)); |
|
| 652 | 651 | urg |= c->tags; |
|
| 653 | 652 | } |
|
| 654 | 653 | dc.x = 0; |
|
| 655 | - | if(mons->next) { /* more than a single monitor */ |
|
| 656 | - | dc.w = TEXTW(monsyms[m->screen_number]); |
|
| 657 | - | drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False); |
|
| 658 | - | dc.x += dc.w; |
|
| 659 | - | } |
|
| 660 | - | m->btx = dc.x; |
|
| 661 | 654 | for(i = 0; i < LENGTH(tags); i++) { |
|
| 662 | 655 | dc.w = TEXTW(tags[i]); |
|
| 663 | 656 | col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm; |
|
| 1690 | 1683 | if(XineramaIsActive(dpy)) |
|
| 1691 | 1684 | info = XineramaQueryScreens(dpy, &n); |
|
| 1692 | 1685 | #endif /* XINERAMA */ |
|
| 1693 | - | if(n > LENGTH(monsyms)) |
|
| 1694 | - | n = LENGTH(monsyms); |
|
| 1695 | 1686 | /* allocate monitor(s) for the new geometry setup */ |
|
| 1696 | 1687 | for(i = 0; i < n; i++) { |
|
| 1697 | 1688 | if(!(m = (Monitor *)malloc(sizeof(Monitor)))) |
|