Changeset 3373:97166aec67ab in roaraudio for roard/roard.c

Timestamp:

02/09/10 20:07:31 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added X11 support

File:

• roard/roard.c (modified) (6 diffs)

roard/roard.c

@@ -167 +167 @@
 #ifdef ROAR_HAVE_LIBSLP
         "     --slp             - Enable OpenSLP support\n"
+#endif
+#ifdef ROAR_HAVE_LIBX11
+        "     --x11             - Enable X11 support\n"
 #endif
         " --jumbo-mtu MTU       - Sets the MTU for Jumbo Packets\n"
@@ -769 +772 @@
 }
 
+// X11:
+#ifdef ROAR_HAVE_LIBX11
+int register_x11 (int unreg, char * sockname) {
+ struct roar_x11_connection * x11con = NULL;
+ int ret = 0;
+
+ if ( (x11con = roar_x11_connect(NULL)) == NULL )
+  return -1;
+
+ if ( unreg ) {
+  if ( roar_x11_delete_prop(x11con, "ROAR_SERVER") == -1 )
+   ret = -1;
+ } else {
+  if ( roar_x11_set_prop(x11con, "ROAR_SERVER", sockname) == -1 )
+   ret = -1;
+ }
+
+ roar_x11_disconnect(x11con);
+
+ return ret;
+}
+#endif
 
 // SLP:
@@ -922 +947 @@
  int    reg_slp   = 0;
 #endif
+#ifdef ROAR_HAVE_LIBX11
+ int    reg_x11   = 0;
+#endif
 #ifdef ROAR_HAVE_CHROOT
  char * chrootdir = NULL;
@@ -1449 +1477 @@
    reg_slp = 1;
 #else
-    ROAR_ERR("No OpenSLP support compiled in!");
-    return 1;
-#endif
+   ROAR_ERR("No OpenSLP support compiled in!");
+   return 1;
+#endif
+
+  } else if ( strcmp(k, "--x11") == 0 ) {
+#ifdef ROAR_HAVE_LIBX11
+   reg_x11 = 1;
+#else
+   ROAR_ERR("No X11 support compiled in!");
+   return 1;
+#endif
+
 
   } else if ( strcmp(k, "--jumbo-mtu") == 0 ) {
@@ -1725 +1762 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBX11
+ if ( reg_x11 ) {
+  register_x11(0, sock_addr);
+ }
+#endif
+
  // start main loop...
  main_loop(drvid, drvinst, &sa, sysclocksync);
@@ -1742 +1785 @@
 #ifdef ROAR_HAVE_LIBSLP
  register_slp(1, NULL);
+#endif
+
+#ifdef ROAR_HAVE_LIBX11
+ register_x11(1, NULL);
 #endif