← Back to branch summary

~oif-team/geis/geis2-add-device

« back to all changes in this revision

Viewing changes to libutouch-geis-xcb/geis_xcb.c

  • Committer: Stephen M. Webb
  • Date: 2010-09-01 18:49:00 UTC
  • mfrom: (74.1.3 geis-logging)
  • Revision ID: stephen.webb@canonical.com-20100901184900-f5k5ohe4kg010sb9
Added improved runtime-configurable diagnostics.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libutouch-geis-xcb/geis_xcb.c
19
19
 */
20
20
#include "geis_xcb.h"
21
21
 
22
 
#include "geis_debug.h"
23
22
#include "geis_instance.h"
 
23
#include "geis_logging.h"
24
24
#include <grail.h>
25
25
#include <grail-types.h>
26
26
#include <stdlib.h>
635
635
                                        win_info->screenp);
636
636
    if (!s_geis_xcb.connection)
637
637
    {
638
 
      geis_debug("error connecting to X server.");
 
638
      geis_error("error connecting to X server.");
639
639
      return NULL;
640
640
    }
641
641
 
663
663
                                                      &error);
664
664
      if (!version_reply)
665
665
      {
666
 
        geis_debug("failed to receive gesture version reply\n");
 
666
        geis_error("failed to receive gesture version reply\n");
667
667
        return NULL;
668
668
      }
669
669
 
670
670
      if (version_reply->major_version != XCB_GESTURE_MAJOR_VERSION
671
671
       && version_reply->minor_version != XCB_GESTURE_MINOR_VERSION)
672
672
      {
673
 
        geis_debug("server supports unrecognized version: %d.%d\n",
 
673
        geis_error("server supports unrecognized version: %d.%d\n",
674
674
                   version_reply->major_version, version_reply->minor_version);
675
675
        free(version_reply);
676
676
        return NULL;
708
708
    {
709
709
      xcb_gesture_notify_event_t *gesture_event = NULL;
710
710
      if (event->response_type != GenericEvent) {
711
 
        geis_debug("warning: Received non-generic event type: %d\n",
712
 
                   event->response_type);
 
711
        geis_warning("warning: Received non-generic event type: %d\n",
 
712
                     event->response_type);
713
713
        continue;
714
714
      }
715
715
 
716
716
      gesture_event = (xcb_gesture_notify_event_t*)event;
717
717
      if (gesture_event->extension != extension_info->major_opcode)
718
718
      {
719
 
        geis_debug("warning: Received non-gesture extension event: %d\n",
720
 
                   gesture_event->extension);
 
719
        geis_warning("warning: Received non-gesture extension event: %d\n",
 
720
                     gesture_event->extension);
721
721
        continue;
722
722
      }
723
723
 
724
724
      if (gesture_event->event_type != XCB_GESTURE_NOTIFY)
725
725
      {
726
 
        geis_debug("warning: Received unrecognized gesture event type: %d\n",
727
 
                   gesture_event->event_type);
 
726
        geis_warning("warning: Received unrecognized gesture event type: %d\n",
 
727
                     gesture_event->event_type);
728
728
        continue;
729
729
      }
730
730
 
804
804
                                                       &error);
805
805
  if (!events_reply)
806
806
  {
807
 
    geis_debug("failed to receive selected events reply\n");
 
807
    geis_error("failed to receive selected events reply\n");
808
808
    goto really_done;
809
809
  }
810
810
 
818
818
      mask_len_reply = xcb_gesture_event_mask_mask_data_length(event_mask);
819
819
      if (mask_len_reply != mask_len)
820
820
      {
821
 
        geis_debug("incorrect mask length returned by server - expected %d, got %d\n",
 
821
        geis_error("incorrect mask length returned by server - expected %d, got %d\n",
822
822
                   mask_len, mask_len_reply);
823
823
        goto done;
824
824
      }
826
826
      mask_reply = xcb_gesture_event_mask_mask_data(event_mask);
827
827
      if (memcmp(mask, mask_reply, mask_len * 4) != 0)
828
828
      {
829
 
        geis_debug("incorrect mask returned by server\n");
 
829
        geis_error("incorrect mask returned by server\n");
830
830
        goto done;
831
831
      }
832
832
 
836
836
 
837
837
  if (!device_is_found)
838
838
  {
839
 
    geis_debug("gesture mask for device %d not returned by server\n", device_id);
 
839
    geis_error("gesture mask for device %d not returned by server\n", device_id);
840
840
    goto done;
841
841
  }
842
842
 
864
864
  geis_xcb_map_gestures_to_mask(gesture_list, &mask, &mask_len);
865
865
  if (!mask)
866
866
  {
867
 
    geis_debug("failed to allocate mask\n");
 
867
    geis_error("failed to allocate mask\n");
868
868
    goto really_done;
869
869
  }
870
870
 
876
876
  error = xcb_request_check(xcb->connection, select_cookie);
877
877
  if (error)
878
878
  {
879
 
    geis_debug("failed to select events\n");
 
879
    geis_error("failed to select events\n");
880
880
    goto done;
881
881
  }
882
882