WLProxy : add debug msgs

Author: pquiring

projects/jfdesktop/src/Startup.java

@@ -84,6 +84,7 @@ public void run() {
     }
     if (is_wayland && use_proxy) {
       //create wayland proxy server
+      WLProxy.debug = true;
       proxy = new WLProxy();
       if (!proxy.start("wayland-0")) {
         JFLog.log("Failed to start wayland proxy");

src/javaforce/linux/wl/WLProxy.java

@@ -14,25 +14,32 @@
  */
 
 public class WLProxy {
+  public static boolean debug = false;
+
   private String real_socket_addr;
   private UnixSocket real_socket;  //wayland-0
   private String proxy_socket_addr;
   private UnixSocket proxy_socket;  //wayland-99
   private boolean active;
   private Server server;
 
+  private static int log = 99;
+
   public boolean start(String real_wayland_display) {
+    if (debug) {
+      JFLog.init(log, System.getenv("HOME") + "/wlproxy.log", true);
+    }
     String real_path = System.getenv("XDG_RUNTIME_DIR");
     if (real_path == null || real_wayland_display == null) {
-      JFLog.log("WLProxy:socket not found");
+      JFLog.log(log, "WLProxy:socket not found");
       return false;
     }
     if (!real_path.endsWith("/")) {
       real_path += "/";
     }
     String temp_path = real_path + "wayland-90";
     real_path += real_wayland_display;
-    JFLog.log("WLProxy:server.socket=" + real_path);
+    JFLog.log(log, "WLProxy:server.socket=" + real_path);
 
     try {
       real_socket_addr = real_path;
@@ -41,7 +48,7 @@ public boolean start(String real_wayland_display) {
       real_socket.bind(temp_path);  //maybe not be necessary
       if (!real_socket.connect(real_path)) throw new Exception("Unable to connect to real wayland socket");
     } catch (Exception e) {
-      JFLog.log(e);
+      JFLog.log(log, e);
       if (real_socket != null) {
         try {real_socket.close();} catch (Exception e2) {}
       }
@@ -52,14 +59,14 @@ public boolean start(String real_wayland_display) {
     String proxy_path = System.getenv("XDG_RUNTIME_DIR");
     String proxy_wayland_display = "wayland-99";
     if (proxy_path == null || proxy_wayland_display == null) {
-      JFLog.log("WLProxy:socket not found");
+      JFLog.log(log, "WLProxy:socket not found");
       return false;
     }
     if (!proxy_path.endsWith("/")) {
       proxy_path += "/";
     }
     proxy_path += proxy_wayland_display;
-    JFLog.log("WLProxy:proxy.socket=" + proxy_path);
+    JFLog.log(log, "WLProxy:proxy.socket=" + proxy_path);
 
     try {
       proxy_socket_addr = proxy_path;
@@ -68,7 +75,7 @@ public boolean start(String real_wayland_display) {
       if (!proxy_socket.bind(proxy_path)) throw new Exception("Unable to bind to socket:" + proxy_path);
       if (!proxy_socket.listen()) throw new Exception("Unable to listen on unix socket");
     } catch (Exception e) {
-      JFLog.log(e);
+      JFLog.log(log, e);
       if (proxy_socket != null) {
         try {proxy_socket.close();} catch (Exception e2) {}
       }
@@ -121,7 +128,7 @@ public void run() {
           session.proxy_client.start();
           sessions.add(session);
         } catch (Exception e) {
-          JFLog.log(e);
+          JFLog.log(log, e);
         }
       }
     }
@@ -146,16 +153,22 @@ public void run() {
           data_len[0] = data.length;
           fds_len[0] = fds.length;
           src.read(data_len, data, fds_len, fds);
+          if (debug) {
+            JFLog.log((monitor ? ">" : "<") + ": read:" + data_len[0] + "," + fds_len[0]);
+          }
           if (monitor) {
             //TODO
           }
           dst.write(data_len, data, fds_len, fds);
+          if (debug) {
+            JFLog.log((monitor ? ">" : "<") + ":write:" + data_len[0] + "," + fds_len[0]);
+          }
           if (fds_len[0] > 0) {
             //close fds received after they have been transferred
             src.close(fds_len[0], fds);
           }
         } catch (Exception e) {
-          JFLog.log(e);
+          JFLog.log(log, e);
           return;
         }
       }