itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop -Denable-binding-event

Browse Source
master
Drew DeVault 8 years ago
parent 25a4a85a59
commit 0a1b211e09
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -45,7 +45,6 @@ option(enable-swaybar "Enables the swaybar utility" YES)
option(enable-swaygrab "Enables the swaygrab utility" YES) option(enable-swaygrab "Enables the swaygrab utility" YES)
option(enable-swaymsg "Enables the swaymsg utility" YES) option(enable-swaymsg "Enables the swaymsg utility" YES)
option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES) option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES)
option(enable-binding-event "Enables binding event subscription" YES)
option(zsh-completions "Zsh shell completions" NO) option(zsh-completions "Zsh shell completions" NO)
option(default-wallpaper "Installs the default wallpaper" YES) option(default-wallpaper "Installs the default wallpaper" YES)
option(ld-library-path "Configures sway's default LD_LIBRARY_PATH" "/usr/lib") option(ld-library-path "Configures sway's default LD_LIBRARY_PATH" "/usr/lib")
@ -86,9 +85,6 @@ if (enable-gdk-pixbuf)
else() else()
message(STATUS "Building without gdk-pixbuf, only png images supported.") message(STATUS "Building without gdk-pixbuf, only png images supported.")
endif() endif()
if(enable-binding-event)
add_definitions(-DSWAY_BINDING_EVENT=1)
endif()
include_directories(include) include_directories(include)

6
sway/ipc-server.c
Unescape View File

@ -343,10 +343,8 @@ void ipc_client_handle_command(struct ipc_client *client) {
client->subscribed_events |= event_mask(IPC_EVENT_WINDOW); client->subscribed_events |= event_mask(IPC_EVENT_WINDOW);
} else if (strcmp(event_type, "modifier") == 0) { } else if (strcmp(event_type, "modifier") == 0) {
client->subscribed_events |= event_mask(IPC_EVENT_MODIFIER); client->subscribed_events |= event_mask(IPC_EVENT_MODIFIER);
#if SWAY_BINDING_EVENT
} else if (strcmp(event_type, "binding") == 0) { } else if (strcmp(event_type, "binding") == 0) {
client->subscribed_events |= event_mask(IPC_EVENT_BINDING); client->subscribed_events |= event_mask(IPC_EVENT_BINDING);
#endif
} else { } else {
ipc_send_reply(client, "{\"success\": false}", 18); ipc_send_reply(client, "{\"success\": false}", 18);
json_object_put(request); json_object_put(request);
@ -639,7 +637,6 @@ void ipc_event_modifier(uint32_t modifier, const char *state) {
json_object_put(obj); // free json_object_put(obj); // free
} }
#if SWAY_BINDING_EVENT
static void ipc_event_binding(json_object *sb_obj) { static void ipc_event_binding(json_object *sb_obj) {
sway_log(L_DEBUG, "Sending binding::run event"); sway_log(L_DEBUG, "Sending binding::run event");
json_object *obj = json_object_new_object(); json_object *obj = json_object_new_object();
@ -651,10 +648,8 @@ static void ipc_event_binding(json_object *sb_obj) {
json_object_put(obj); // free json_object_put(obj); // free
} }
#endif
void ipc_event_binding_keyboard(struct sway_binding *sb) { void ipc_event_binding_keyboard(struct sway_binding *sb) {
#if SWAY_BINDING_EVENT
json_object *sb_obj = json_object_new_object(); json_object *sb_obj = json_object_new_object();
json_object_object_add(sb_obj, "command", json_object_new_string(sb->command)); json_object_object_add(sb_obj, "command", json_object_new_string(sb->command));
@ -705,5 +700,4 @@ void ipc_event_binding_keyboard(struct sway_binding *sb) {
json_object_object_add(sb_obj, "input_type", json_object_new_string("keyboard")); json_object_object_add(sb_obj, "input_type", json_object_new_string("keyboard"));
ipc_event_binding(sb_obj); ipc_event_binding(sb_obj);
#endif
} }

Write Preview
Loading…
Cancel
Save