Removed bad cookie checks. Button handlers taking mouse button (from milestone4-sendEvent branch on old repo).

1 files changed, 5 insertions, 21 deletions

diff --git a/src/libxcwm/input.c b/src/libxcwm/input.c
index bbe00e2..8beb594 100644
--- a/src/libxcwm/input.c
+++ b/src/libxcwm/input.c
@@ -31,19 +31,11 @@
 void
 xcwm_key_press (xcwm_context_t *context, int window, uint8_t code)
 {
-    xcb_generic_error_t *err;
-    xcb_void_cookie_t cookie;
     xcb_window_t none = { XCB_NONE };
     
-    cookie = xcb_test_fake_input( context->conn, XCB_KEY_PRESS, code, 
-                                 XCB_CURRENT_TIME, none, 0, 0, 1 );  
+    xcb_test_fake_input( context->conn, XCB_KEY_PRESS, code, 
+						 XCB_CURRENT_TIME, none, 0, 0, 1 );  
     
-    err = xcb_request_check(context->conn, cookie);
-    if (err)
-    {
-        printf("err ");
-        free(err);
-    }	
     xcb_flush(context->conn);
     printf("xcwm.c received key down - uint8_t '%i', from Mac window #%i to context.window %u\n", code,  window, context->window);
 }
@@ -51,19 +43,11 @@ xcwm_key_press (xcwm_context_t *context, int window, uint8_t code)
 void
 xcwm_key_release (xcwm_context_t *context, int window, uint8_t code)
 {
-    xcb_generic_error_t *err;
-    xcb_void_cookie_t cookie;
     xcb_window_t none = { XCB_NONE };
     
     xcb_test_fake_input( context->conn, XCB_KEY_RELEASE, code, 
                         XCB_CURRENT_TIME, none,0 ,0 , 1 );
     
-    err = xcb_request_check(context->conn, cookie);
-    if (err)
-    {
-        printf("err ");
-        free(err);
-    }	
     xcb_flush(context->conn);
     printf("xcwm.c received key release- uint8_t '%i', from Mac window #%i to context.window %u\n", code,  window, context->window);
 }
@@ -72,16 +56,16 @@ void
 xcwm_button_press (xcwm_context_t *context, long x, long y, int window, int button)
 {
     //xcb_window_t none = { XCB_NONE };
-    xcb_test_fake_input (context->conn, XCB_BUTTON_PRESS, 1, XCB_CURRENT_TIME,
+    xcb_test_fake_input (context->conn, XCB_BUTTON_PRESS, button, XCB_CURRENT_TIME,
                          context->window, 0, 0, 0);
 	xcb_flush(context->conn);
-    printf("button down received by xcwm.c - (%ld,%ld) in Mac window #%i\n", x, y, window);
+    printf("button down received by xtoq.c - (%ld,%ld) in Mac window #%i\n", x, y, window);
 }
 
 void
 xcwm_button_release (xcwm_context_t *context, long x, long y, int window, int button)
 {
-    xcb_test_fake_input (context->conn, XCB_BUTTON_RELEASE, 1, XCB_CURRENT_TIME,
+    xcb_test_fake_input (context->conn, XCB_BUTTON_RELEASE, button, XCB_CURRENT_TIME,
                          context->window, 0, 0, 0);
 	xcb_flush(context->conn);
     printf("button release received by xcwm.c - (%ld,%ld) in Mac window #%i\n", x, y, window);