Changeset 3371:dbd3f8c59d29 in roaraudio

Timestamp:

02/08/10 23:10:43 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote most of the X11 stuff

Files:

• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/roarx11.h (modified) (1 diff)
• libroar/roarx11.c (modified) (1 diff)

include/libroar/libroar.h

@@ -94 +94 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBX11
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#endif
+
 #include "error.h"
 #include "config.h"

include/libroar/roarx11.h

@@ -38 +38 @@
 #include "libroar.h"
 
+struct roar_x11_connection {
+#ifdef ROAR_HAVE_LIBX11
+ Display * display;
+#else
+ char dummy[8];
+#endif
+};
+
+struct roar_x11_connection * roar_x11_connect(char * display);
+int roar_x11_disconnect(struct roar_x11_connection * con);
+
+int roar_x11_set_prop(struct roar_x11_connection * con, const char * key, const char * val);
+int roar_x11_delete_prop(struct roar_x11_connection * con, const char * key);
+
 #endif
 

libroar/roarx11.c

@@ -35 +35 @@
 #include "libroar.h"
 
+struct roar_x11_connection * roar_x11_connect(char * display) {
+#ifdef ROAR_HAVE_LIBX11
+ struct roar_x11_connection * con;
+
+ if ( (con = roar_mm_malloc(sizeof(struct roar_x11_connection))) == NULL )
+  return NULL;
+
+ if ( (con->display = XOpenDisplay(display)) == NULL ) {
+  roar_mm_free(con);
+  return NULL;
+ }
+
+ return con;
+#else
+ return NULL;
+#endif
+}
+
+int roar_x11_disconnect(struct roar_x11_connection * con) {
+#ifdef ROAR_HAVE_LIBX11
+ int ret;
+
+ if ( con == NULL )
+  return -1;
+
+ ret = XCloseDisplay(con->display);
+
+ roar_mm_free(con);
+
+ return ret;
+#else
+ return -1;
+#endif
+}
+
+int roar_x11_set_prop(struct roar_x11_connection * con, const char * key, const char * val) {
+#ifdef ROAR_HAVE_LIBX11
+ Atom a;
+
+ if ( con == NULL )
+  return -1;
+
+ a = XInternAtom(con->display, key, False);
+
+ XChangeProperty(con->display, RootWindow(con->display, 0), a, XA_STRING, 8, PropModeReplace, (const unsigned char*) val, strlen(val)+1);
+
+ return 0;
+#else
+ return -1;
+#endif
+}
+
+int roar_x11_delete_prop(struct roar_x11_connection * con, const char * key) {
+#ifdef ROAR_HAVE_LIBX11
+ Atom a;
+ if ( con == NULL )
+  return -1;
+
+ a = XInternAtom(con->display, key, False);
+ XDeleteProperty(con->display, RootWindow(con->display, 0), a);
+
+ return 0;
+#else
+ return -1;
+#endif
+}
+
 //ll