mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 03:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Xembed Support

Browse source 
Xembed support is premature in sway and should be postponed. This commit
only removes swaybar starting xembedsniproxy, if users would like, they
can still start xembedsniproxy manually, however there will be no
official support.
This commit is contained in:
Calvin Lee 2017-06-13 12:42:11 -07:00
parent 0a71aa6e97
commit 33fdae2001
3 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/swaybar/bar.h
View file

@ -15,9 +15,6 @@ struct bar {
int ipc_socketfd; int ipc_socketfd;
int status_read_fd; int status_read_fd;
pid_t status_command_pid; pid_t status_command_pid;
#ifdef ENABLE_TRAY
pid_t xembed_pid;
#endif
}; };
struct output { struct output {

5
swaybar/bar.c
View file

@ -27,9 +27,6 @@ static void bar_init(struct bar *bar) {
bar->config = init_config(); bar->config = init_config();
bar->status = init_status_line(); bar->status = init_status_line();
bar->outputs = create_list(); bar->outputs = create_list();
#ifdef ENABLE_TRAY
bar->xembed_pid = 0;
#endif
} }
static void spawn_status_cmd_proc(struct bar *bar) { static void spawn_status_cmd_proc(struct bar *bar) {
@ -252,8 +249,6 @@ void bar_run(struct bar *bar) {
event_loop_poll(); event_loop_poll();
#ifdef ENABLE_TRAY #ifdef ENABLE_TRAY
tray_upkeep(bar);
dispatch_dbus(); dispatch_dbus();
#endif #endif
} }

16
swaybar/tray/tray.c
View file

@ -379,19 +379,6 @@ uint32_t tray_render(struct output *output, struct config *config) {
return tray_width; return tray_width;
} }
void tray_upkeep(struct bar *bar) {
if (!bar->xembed_pid ||
(bar->xembed_pid == waitpid(bar->xembed_pid, NULL, WNOHANG))) {
pid_t pid = fork();
if (pid == 0) {
execlp("xembedsniproxy", "xembedsniproxy", NULL);
_exit(EXIT_FAILURE);
} else {
bar->xembed_pid = pid;
}
}
}
void init_tray(struct bar *bar) { void init_tray(struct bar *bar) {
if (!bar->config->tray_output || strcmp(bar->config->tray_output, "none") != 0) { if (!bar->config->tray_output || strcmp(bar->config->tray_output, "none") != 0) {
/* Connect to the D-Bus */ /* Connect to the D-Bus */
@ -402,8 +389,5 @@ void init_tray(struct bar *bar) {
/* Start the SNI host */ /* Start the SNI host */
init_host(); init_host();
/* Start xembedsniproxy */
tray_upkeep(bar);
} }
} }