hiro/yabar
1
0
Fork 0
mirror of https://github.com/vale981/yabar synced 2025-03-05 09:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix urgent desktop identification

Browse source
This commit is contained in:
NBonaparte 2017-02-05 14:14:42 -08:00
parent 154d728518
commit e2db8b2267
4 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/yabar.h
View file

@ -323,6 +323,7 @@ struct yabar_gen_info {
uint32_t curws;
uint32_t lstws;
ya_ewmh_blk *ewmh_blk;
xcb_atom_t hints;
#endif //YA_INTERNAL_EWMH
char **argv;
int xrandr_offset;

3
src/ya_draw.c
View file

@ -17,6 +17,7 @@ enum {
NET_WM_STATE,
NET_WM_STATE_STICKY,
NET_WM_STATE_ABOVE,
WM_HINTS,
};
/*
@ -33,6 +34,7 @@ static void ya_setup_ewmh(ya_bar_t *bar) {
"_NET_WM_STATE",
"_NET_WM_STATE_STICKY",
"_NET_WM_STATE_ABOVE",
"WM_HINTS",
};
const int atoms = sizeof(atom_names)/sizeof(char *);
xcb_intern_atom_cookie_t atom_cookie[atoms];
@ -65,6 +67,7 @@ static void ya_setup_ewmh(ya_bar_t *bar) {
//TODO right and left bars if implemented.
}
ya.hints = atom_list[WM_HINTS];
xcb_change_property(ya.c, XCB_PROP_MODE_REPLACE, bar->win, atom_list[NET_WM_WINDOW_TYPE], XCB_ATOM_ATOM, 32, 1, &atom_list[NET_WM_WINDOW_TYPE_DOCK]);
xcb_change_property(ya.c, XCB_PROP_MODE_APPEND, bar->win, atom_list[NET_WM_STATE], XCB_ATOM_ATOM, 32, 2, &atom_list[NET_WM_STATE_STICKY]);
xcb_change_property(ya.c, XCB_PROP_MODE_REPLACE, bar->win, atom_list[NET_WM_DESKTOP], XCB_ATOM_CARDINAL, 32, 1, (const uint32_t []){ -1 } );

54
src/ya_exec.c
View file

@ -99,13 +99,11 @@ inline static void ya_exec_intern_ewmh_blk(ya_block_t *blk) {
fprintf(stderr, "Error getting number of desktops\n");
break;
}
//printf("Number of desktops: %d\n", num_desktops);
//make an array with size _NET_NUMBER_OF_DESKTOPS
//this only stores the state, not the final buffer
// e = empty, o = occupied, f = focused, u = urgent
char desktops[num_desktops];
memset(desktops, 'e', num_desktops);
//printf("%s %d %d\n", desktops, strlen(desktops), num_desktops);
//get all clients
xcb_ewmh_get_windows_reply_t clients;
@ -116,41 +114,30 @@ inline static void ya_exec_intern_ewmh_blk(ya_block_t *blk) {
}
//find all occupied desktops
for(int i = 0; i < clients.windows_len; i++) {
xcb_window_t id = clients.windows[i];
uint32_t mask[] = {XCB_EVENT_MASK_PROPERTY_CHANGE};
xcb_change_window_attributes(ya.c, id, XCB_CW_EVENT_MASK, mask);
xcb_get_property_cookie_t c_dktp;//, c_ste;
uint32_t desktop;
//xcb_ewmh_get_atoms_reply_t *state = NULL;
xcb_window_t id = clients.windows[i];
c_dktp = xcb_ewmh_get_wm_desktop(ya.ewmh, id);
xcb_ewmh_get_wm_desktop_reply(ya.ewmh, c_dktp, &desktop, NULL);
//printf("Occupied desktop: %d\n", desktop);
desktops[desktop] = 'o';
//check if urgent
//c_ste = xcb_ewmh_get_wm_state(ya.ewmh, id);
//if(xcb_ewmh_get_wm_state_reply(ya.ewmh, c_ste, state, NULL) != 1) {
// //window has no state, ignore
// //fprintf(stderr, "Error getting state of window %x\n", id);
//}
//else {
// for(int j = 0; j < state->atoms_len; j++) {
// if(state->atoms[j] == ya.ewmh->_NET_WM_STATE_DEMANDS_ATTENTION) {
// //printf("Urgent desktop: %d\n", desktop);
// desktops[desktop] = 'u';
// }
// }
//}
//xcb_icccm_wm_hints_t *hints = NULL;
//xcb_get_property_cookie_t c_hint = xcb_icccm_get_wm_hints(ya.c, id);
//if(xcb_icccm_get_wm_hints_reply(ya.c, c_hint, hints, NULL) != 1) {
// fprintf(stderr, "Error getting WM hints\n");
//}
//else {
// if(xcb_icccm_wm_hints_get_urgency(hints) == (1L << 8))
// desktops[desktop] = 'u';
//}
//free(hints);
xcb_icccm_wm_hints_t hints;
xcb_get_property_cookie_t c_hint = xcb_icccm_get_wm_hints(ya.c, id);
if(xcb_icccm_get_wm_hints_reply(ya.c, c_hint, &hints, NULL) != 1) {
//no hints defined, ignore
}
else {
if(xcb_icccm_wm_hints_get_urgency(&hints) == (1L << 8)) {
desktops[desktop] = 'u';
}
}
}
xcb_ewmh_get_windows_reply_wipe(&clients);
c_cur = xcb_ewmh_get_current_desktop(ya.ewmh, 0);
xcb_ewmh_get_current_desktop_reply(ya.ewmh, c_cur, &cur_desktop, NULL);
//printf("Current desktop: %d\n", cur_desktop);
@ -171,15 +158,15 @@ inline static void ya_exec_intern_ewmh_blk(ya_block_t *blk) {
char *name_arr[num_strings];
int j = 0;
name_arr[j] = names.strings;
//printf("%s\n", names.strings);
for(int i = 1; i < num_strings; i++) {
if(names.strings[i] == '\0')
name_arr[++j] = &names.strings[++i];
}
//if(num_strings < num_desktops)
// desktops with high numbers unnamed
//if num_strings < num_desktops, desktops with high numbers unnamed
for(int i = 0; i < num_desktops; i++) {
//printf("%s\n", name_arr[i]);
//TODO: use markup to create underline, overline, etc.
//set blk->attr |= BLKA_MARKUP_PANGO?
switch(desktops[i]) {
//case 'e':
// strcat(blk->buf, icons[0]);
@ -731,6 +718,9 @@ void ya_handle_prop_notify(xcb_property_notify_event_t *ep) {
else if ((ep->atom == ya.ewmh->_NET_WM_NAME) || (ep->atom == ya.ewmh->_NET_WM_VISIBLE_NAME)) {
//Same window, but title changed. Therefore don't return.
}
else if (ep->atom == ya.hints) {
//WM_HINTS changed, meaning that a window is now urgent
}
else {
return;
}

1
src/ya_parse.c
View file

@ -394,6 +394,7 @@ inline static void ya_setup_ewmh_intern_blk(ya_block_t *blk) {
ya_ewmh_blk *cur=NULL;
switch(blk->internal->index) {
case YA_INT_WORKSPACES:
blk->attr |= BLKA_MARKUP_PANGO;
case YA_INT_WORKSPACE:
case YA_INT_TITLE:
blk->attr |= BLKA_INTERN_X_EV;