Event: Remove send_client_message function
This commit is contained in:
parent
374abb0e26
commit
e6fc0a4976
@ -830,7 +830,7 @@ client_moveresize(Client *c, XRectangle geo, Bool r)
|
||||
|
||||
frame_moveresize(c, c->geo);
|
||||
|
||||
XMoveResizeWindow(dpy, c->win, BORDH, TBARH, geo.width, geo.height);
|
||||
XMoveResizeWindow(dpy, c->win, BORDH, TBARH, c->geo.width, c->geo.height);
|
||||
|
||||
client_update_attributes(c);
|
||||
client_configure(c);
|
||||
|
||||
26
src/event.c
26
src/event.c
@ -647,32 +647,6 @@ unmapnotify(XUnmapEvent *ev)
|
||||
return;
|
||||
}
|
||||
|
||||
/** Send a client event
|
||||
*\param data Event data
|
||||
*\param atom_name Event atom name
|
||||
*/
|
||||
void
|
||||
send_client_event(long data[5], char *atom_name)
|
||||
{
|
||||
XEvent ev;
|
||||
int i;
|
||||
|
||||
ev.xclient.type = ClientMessage;
|
||||
ev.xclient.serial = 0;
|
||||
ev.xclient.send_event = True;
|
||||
ev.xclient.message_type = ATOM(atom_name);
|
||||
ev.xclient.window = ROOT;
|
||||
ev.xclient.format = 32;
|
||||
|
||||
for(i = 0; i < 5; ++i, ev.xclient.data.l[i] = data[i]);
|
||||
|
||||
XSendEvent(dpy, ROOT, False, SubstructureRedirectMask | SubstructureNotifyMask, &ev);
|
||||
XSync(dpy, False);
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/** Event handle function: execute every function
|
||||
* handle by event
|
||||
* \param ev Event
|
||||
|
||||
@ -173,14 +173,10 @@ getinfo_nmaster(void)
|
||||
void
|
||||
getinfo(char *info)
|
||||
{
|
||||
long data[5];
|
||||
|
||||
if(!check_wmfs_running())
|
||||
return;
|
||||
|
||||
data[4] = True;
|
||||
|
||||
send_client_event(data, "_WMFS_UPDATE_HINTS");
|
||||
ewmh_send_message(ROOT, ROOT, "_WMFS_UPDATE_HINTS", 0, 0, 0, 0, True);
|
||||
|
||||
if(!strcmp(info, "tag"))
|
||||
getinfo_tag();
|
||||
|
||||
19
src/wmfs.c
19
src/wmfs.c
@ -330,15 +330,11 @@ check_wmfs_running(void)
|
||||
void
|
||||
exec_uicb_function(char *func, char *cmd)
|
||||
{
|
||||
long data[5];
|
||||
|
||||
/* Check if wmfs is running (this function is executed when wmfs
|
||||
is already running normally...) */
|
||||
if(!check_wmfs_running())
|
||||
return;
|
||||
|
||||
data[4] = True;
|
||||
|
||||
XChangeProperty(dpy, ROOT, ATOM("_WMFS_FUNCTION"), ATOM("UTF8_STRING"),
|
||||
8, PropModeReplace, (uchar*)func, strlen(func));
|
||||
|
||||
@ -348,7 +344,7 @@ exec_uicb_function(char *func, char *cmd)
|
||||
XChangeProperty(dpy, ROOT, ATOM("_WMFS_CMD"), ATOM("UTF8_STRING"),
|
||||
8, PropModeReplace, (uchar*)cmd, strlen(cmd));
|
||||
|
||||
send_client_event(data, "_WMFS_FUNCTION");
|
||||
ewmh_send_message(ROOT, ROOT, "_WMFS_FUNCTION", 0, 0, 0, 0, True);
|
||||
|
||||
return;
|
||||
}
|
||||
@ -360,11 +356,8 @@ void
|
||||
set_statustext(int s, char *str)
|
||||
{
|
||||
int i;
|
||||
long data[5];
|
||||
char atom_name[64];
|
||||
|
||||
data[4] = True;
|
||||
|
||||
if(!str)
|
||||
return;
|
||||
|
||||
@ -377,7 +370,7 @@ set_statustext(int s, char *str)
|
||||
XChangeProperty(dpy, ROOT, ATOM(atom_name), ATOM("UTF8_STRING"),
|
||||
8, PropModeReplace, (uchar*)str, strlen(str));
|
||||
|
||||
send_client_event(data, atom_name);
|
||||
ewmh_send_message(ROOT, ROOT, atom_name, 0, 0, 0, 0, True);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -387,7 +380,7 @@ set_statustext(int s, char *str)
|
||||
XChangeProperty(dpy, ROOT, ATOM(atom_name), ATOM("UTF8_STRING"),
|
||||
8, PropModeReplace, (uchar*)str, strlen(str));
|
||||
|
||||
send_client_event(data, atom_name);
|
||||
ewmh_send_message(ROOT, ROOT, atom_name, 0, 0, 0, 0, True);
|
||||
}
|
||||
|
||||
return;
|
||||
@ -398,14 +391,10 @@ set_statustext(int s, char *str)
|
||||
void
|
||||
update_status(void)
|
||||
{
|
||||
long data[5];
|
||||
|
||||
if(!check_wmfs_running())
|
||||
return;
|
||||
|
||||
data[4] = True;
|
||||
|
||||
send_client_event(data, "_WMFS_UPDATE_STATUS");
|
||||
ewmh_send_message(ROOT, ROOT, "_WMFS_UPDATE_STATUS", 0, 0, 0, 0, True);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@ -248,7 +248,6 @@ void reparentnotify(XReparentEvent *ev);
|
||||
void selectionclearevent(XSelectionClearEvent *ev);
|
||||
void propertynotify(XPropertyEvent *ev);
|
||||
void unmapnotify(XUnmapEvent *ev);
|
||||
void send_client_event(long data[5], char *atom_name);
|
||||
void getevent(XEvent ev);
|
||||
|
||||
/* menu.c */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user