Merge branch 'master' into xi2

Conflicts:
	src/property.c
	src/xinput.c
	src/xinput.h

diff --cc configure.ac
Simple merge

diff --cc src/list.c
index 52e3961eeda648b701f8ac34637106acf62bd4e2,bd71a5cccc70aa77c39ceea4866779a600154fce..24edc70b43fc9196a11ee74335b61799685ad4c2
--- 1/src/list.c
--- 2/src/list.c
+++ b/src/list.c
@@@ -120,8 -143,30 +123,8 @@@ static int list_xi1(Display     *displa
          do {
              info = XListInputDevices(display, &num_devices);
              for(loop=0; loop<num_devices; loop++) {
-                 print_info(info+loop, shortformat);
+                 print_info(display, info+loop, shortformat);
              }
 -
 -#if HAVE_XI2
 -            /* just wait for the next generic event to come along */
 -            while (daemon && !XNextEvent(display, &ev))
 -            {
 -                if (ev.type == GenericEvent)
 -                {
 -                    XGenericEvent* gev = (XGenericEvent*)&ev;
 -                    /* we just assume that extension is IReqCode, pretty save
 -                       since we don't register for other events. */
 -                    if (gev->evtype == XI_DeviceHierarchyChangedNotify)
 -                    {
 -                        printf("Hierarchy change.\n");
 -                    } else if (gev->evtype == XI_DeviceClassesChangedNotify)
 -                    {
 -                        printf("Device classes changed.\n");
 -                        free(((XDeviceClassesChangedEvent*)&ev)->inputclassinfo);
 -                    }
 -                    break;
 -                }
 -            }
 -#endif
          } while(daemon);
      } else {
        int     ret = EXIT_SUCCESS;

diff --cc src/property.c
index f30b01b56fcf03b3c81a4c857ece6b17d21869fd,db46059e6edf8ab43b5e0d61448ef55ccfbcc6a5..b5f11079dc09c9303ff484279eca61bb2b46ca8c
--- 1/src/property.c
--- 2/src/property.c
+++ b/src/property.c
@@@ -101,12 -126,12 +126,12 @@@ print_property(Display *dpy, XDevice* d
                      break;
              }
  
-             ptr += act_format/8;
+             ptr += size;
  
 -            if (j < nitems - 1)
 -                printf(", ");
              if (done == True)
                  break;
 +            if (j < nitems - 1)
 +                printf(", ");
          }
          printf("\n");
          XFree(data);

diff --cc src/xinput.c
Simple merge

diff --cc src/xinput.h
index 4b6809048ddab3418ff4831e4c903113cceecd07,c4a6f8f96e57b1f1f55891c35f08e8dfc5b4af5b..c7269b932db9bc2f01ab89c624350b170700c64a
--- 1/src/xinput.h
--- 2/src/xinput.h
+++ b/src/xinput.h
@@@ -41,47 -38,34 +41,39 @@@
  #define EXIT_FAILURE 0
  #endif
  
- XDeviceInfo*
- find_device_info(
-                Display        *display,
-                char           *name,
-                Bool           only_extended
-                );
- int
- xi2_find_device_id(Display *display, char *name);
 +
+ XDeviceInfo* find_device_info( Display *display, char *name, Bool only_extended);
++int xi2_find_device_id(Display *display, char *name);
 +int xinput_version(Display* display);
  
- #define DECLARE(name) \
-     int (name) ( \
-                Display*       display, \
-                int            argc, \
-                char           *argv[], \
-                char           *prog_name, \
-                char           *prog_desc \
- )
+ int get_feedbacks( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_ptr_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int get_button_map( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_button_map( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_pointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ 
+ int set_mode( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int list( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int test( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int version( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_integer_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int query_state( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ 
+ /* X Input 1.5 */
+ int list_props( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_int_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_float_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_atom_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int watch_props( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int delete_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ 
+ /* X Input 2.0 */
+ int create_master( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int remove_master( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int change_attachment( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+ int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
++int test_xi2( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 +
- DECLARE(get_feedbacks);
- DECLARE(set_ptr_feedback);
- DECLARE(get_button_map);
- DECLARE(set_button_map);
- DECLARE(set_pointer);
- DECLARE(set_mode);
- DECLARE(list);
- DECLARE(test);
- DECLARE(version);
- DECLARE(set_integer_feedback);
- DECLARE(query_state);
- DECLARE(create_master);
- DECLARE(remove_master);
- DECLARE(change_attachment);
- DECLARE(float_device);
- DECLARE(set_clientpointer);
- DECLARE(test_xi2);
- DECLARE(list_props);
- DECLARE(set_int_prop);
- DECLARE(set_float_prop);
- DECLARE(set_atom_prop);
- DECLARE(watch_props);
- DECLARE(delete_prop);
  /* end of xinput.h */