5050#endif
5151#include <xcb/xcb_aux.h>
5252#include <xcb/randr.h>
53- #include <xcb/xtest.h>
54- #include <time.h>
5553
5654#include "i3lock.h"
5755#include "xcb.h"
@@ -264,7 +262,6 @@ bool pass_media_keys = false;
264262bool pass_screen_keys = false;
265263bool pass_power_keys = false;
266264bool pass_volume_keys = false;
267- bool special_passthrough = false;
268265
269266// for the rendering thread, so we can clean it up
270267pthread_t draw_thread ;
@@ -658,32 +655,6 @@ static bool skip_without_validation(void) {
658655 return false;
659656}
660657
661- /*
662- * Sends key press event to root/wm
663- * Releases the keyboard, sends the event, and
664- * grabs the keyboard again
665- * */
666- static void send_key_to_root (xcb_key_press_event_t * event , bool twice ) {
667- if (!special_passthrough ) {
668- xcb_send_event (conn , true, screen -> root , XCB_EVENT_MASK_BUTTON_PRESS , (char * )event );
669- return ;
670- }
671-
672- xcb_ungrab_keyboard (conn , XCB_CURRENT_TIME );
673- DEBUG ("Received: %d at %ld\n" , event -> detail , time (0 ));
674-
675- xcb_test_fake_input (conn , XCB_KEY_PRESS , event -> detail , XCB_CURRENT_TIME , screen -> root , 0 , 0 , 0 );
676- xcb_test_fake_input (conn , XCB_KEY_RELEASE , event -> detail , XCB_CURRENT_TIME , screen -> root , 0 , 0 , 0 );
677-
678- if (twice ) {
679- xcb_test_fake_input (conn , XCB_KEY_PRESS , event -> detail , XCB_CURRENT_TIME , screen -> root , 0 , 0 , 0 );
680- xcb_test_fake_input (conn , XCB_KEY_RELEASE , event -> detail , XCB_CURRENT_TIME , screen -> root , 0 , 0 , 0 );
681- }
682-
683- xcb_grab_keyboard (conn , true, screen -> root , XCB_CURRENT_TIME , XCB_GRAB_MODE_ASYNC , XCB_GRAB_MODE_ASYNC );
684- xcb_set_input_focus (conn , XCB_INPUT_FOCUS_PARENT , win , XCB_CURRENT_TIME );
685- }
686-
687658/*
688659 * Handle key presses. Fixes state, then looks up the key symbol for the
689660 * given keycode, then looks up the key symbol (as UCS-2), converts it to
@@ -743,7 +714,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
743714 case XKB_KEY_XF86AudioMute :
744715 case XKB_KEY_XF86AudioLowerVolume :
745716 case XKB_KEY_XF86AudioRaiseVolume :
746- send_key_to_root ( event , true);
717+ xcb_send_event ( conn , true, screen -> root , XCB_EVENT_MASK_BUTTON_PRESS , ( char * ) event );
747718 return ;
748719 }
749720 }
@@ -753,7 +724,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
753724 switch (ksym ) {
754725 case XKB_KEY_XF86MonBrightnessUp :
755726 case XKB_KEY_XF86MonBrightnessDown :
756- send_key_to_root ( event , false );
727+ xcb_send_event ( conn , true, screen -> root , XCB_EVENT_MASK_BUTTON_PRESS , ( char * ) event );
757728 return ;
758729 }
759730 }
@@ -764,7 +735,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
764735 case XKB_KEY_XF86PowerDown :
765736 case XKB_KEY_XF86PowerOff :
766737 case XKB_KEY_XF86Sleep :
767- send_key_to_root ( event , false );
738+ xcb_send_event ( conn , true, screen -> root , XCB_EVENT_MASK_BUTTON_PRESS , ( char * ) event );
768739 return ;
769740 }
770741 }
@@ -775,7 +746,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
775746 case XKB_KEY_XF86AudioMute :
776747 case XKB_KEY_XF86AudioLowerVolume :
777748 case XKB_KEY_XF86AudioRaiseVolume :
778- send_key_to_root ( event , true);
749+ xcb_send_event ( conn , true, screen -> root , XCB_EVENT_MASK_BUTTON_PRESS , ( char * ) event );
779750 return ;
780751 }
781752 }
@@ -1586,7 +1557,6 @@ int main(int argc, char *argv[]) {
15861557 {"pass-screen-keys" , no_argument , NULL , 602 },
15871558 {"pass-power-keys" , no_argument , NULL , 603 },
15881559 {"pass-volume-keys" , no_argument , NULL , 604 },
1589- {"special-passthrough" , no_argument , NULL , 605 },
15901560
15911561 // bar indicator stuff
15921562 {"bar-indicator" , no_argument , NULL , 700 },
@@ -2148,9 +2118,6 @@ int main(int argc, char *argv[]) {
21482118 case 604 :
21492119 pass_volume_keys = true;
21502120 break ;
2151- case 605 :
2152- special_passthrough = true;
2153- break ;
21542121
21552122 // Bar indicator
21562123 case 700 :
0 commit comments