port to new setup, add multihead support

port to new setup, and blow away all monitoring stuff, just use
    sn-monitor.h
make it all multihead-safe
port to new setup and strip the other stuff out
s/DESKTOP_LAUNCH_ID/DESKTOP_STARTUP_ID/ for env variable, add
    _NET_STARTUP_ID window manager hint.

5 files changed, 30 insertions, 120 deletions

diff --git a/test/test-launchee.c b/test/test-launchee.c
index 7751cbd..14a7fd9 100644
--- a/test/test-launchee.c
+++ b/test/test-launchee.c
@@ -33,7 +33,6 @@ main (int argc, char **argv)
   Display *xdisplay;
   SnDisplay *display;
   SnLauncheeContext *context;
-  int i;
   
   xdisplay = XOpenDisplay (NULL);
   if (xdisplay == NULL)
@@ -51,7 +50,8 @@ main (int argc, char **argv)
                             error_trap_push,
                             error_trap_pop);
 
-  context = sn_launchee_context_new_from_environment (display);
+  context = sn_launchee_context_new_from_environment (display,
+                                                      DefaultScreen (xdisplay));
 
   if (context == NULL)
     {
@@ -59,18 +59,11 @@ main (int argc, char **argv)
       exit (1);
     }
 
-  printf ("Launchee started with window 0x%lx ID \"%s\"\n",
-          sn_launchee_context_get_launch_window (context),
-          sn_launchee_context_get_launch_id (context));
+  printf ("Launchee started with window ID \"%s\"\n",
+          sn_launchee_context_get_startup_id (context));
 
   /* simulate startup time */
-  i = 0;
-  while (i < 4)
-    {
-      sleep (1);
-      sn_launchee_context_pulse (context);
-      ++i;
-    }
+  sleep (4);
 
   printf ("Launchee startup complete\n");
   sn_launchee_context_complete (context);
diff --git a/test/test-launcher.c b/test/test-launcher.c
index 2005026..053e84b 100644
--- a/test/test-launcher.c
+++ b/test/test-launcher.c
@@ -29,30 +29,6 @@
 
 static pid_t child_pid = 0;
 
-static void
-launcher_event_func (SnLauncherEvent *event,
-                     void            *user_data)
-{
-  SnLauncherContext *context;
-
-  context = sn_launcher_event_get_context (event);
-  
-  switch (sn_launcher_event_get_type (event))
-    {
-    case SN_LAUNCHER_EVENT_COMPLETED:
-      printf ("Completed!\n");
-      break;
-    case SN_LAUNCHER_EVENT_CANCELED:
-      printf ("Canceled!\n");
-      kill (child_pid, SIGTERM);
-      sn_launcher_context_complete (context);
-      break;
-    case SN_LAUNCHER_EVENT_PULSE:
-      printf (" pulse.\n");
-      break;
-    }
-}
-
 int
 main (int argc, char **argv)
 {
@@ -82,13 +58,10 @@ main (int argc, char **argv)
                             error_trap_push,
                             error_trap_pop);
 
-  context = sn_launcher_context_new (display,
-                                     launcher_event_func,
-                                     NULL, NULL);  
+  context = sn_launcher_context_new (display, DefaultScreen (xdisplay));
 
-  sn_launcher_context_set_launch_name (context, "Test Launch");
-  sn_launcher_context_set_launch_description (context, "Launching a test program for libsn");
-  sn_launcher_context_set_supports_cancel (context, TRUE);
+  sn_launcher_context_set_name (context, "Test Launch");
+  sn_launcher_context_set_description (context, "Launching a test program for libsn");
   sn_launcher_context_set_binary_name (context, argv[1]);
   
   sn_launcher_context_initiate (context,
@@ -108,8 +81,6 @@ main (int argc, char **argv)
       _exit (1);
       break;
     }
-
-  sn_launcher_context_set_pid (context, child_pid);
   
   while (TRUE)
     {
diff --git a/test/test-monitor.c b/test/test-monitor.c
index 6f031fd..b6e40d2 100644
--- a/test/test-monitor.c
+++ b/test/test-monitor.c
@@ -32,106 +32,51 @@ monitor_event_func (SnMonitorEvent *event,
                     void            *user_data)
 {
   SnMonitorContext *context;
-  SnLaunchSequence *sequence;
+  SnStartupSequence *sequence;
   
   context = sn_monitor_event_get_context (event);
-  sequence = sn_monitor_event_get_launch_sequence (event);
+  sequence = sn_monitor_event_get_startup_sequence (event);
   
   switch (sn_monitor_event_get_type (event))
     {
     case SN_MONITOR_EVENT_INITIATED:
+      printf ("Initiated sequence %s\n",
+              sn_startup_sequence_get_id (sequence));
+      /* FALL THRU */
+    case SN_MONITOR_EVENT_CHANGED:
       {
-        int x, y, w, h;
         const char *s;
-        
-        printf ("Initiated sequence %s\n",
-                sn_launch_sequence_get_id (sequence));
-        printf (" launch window 0x%lx\n",
-                sn_launch_sequence_get_window (sequence));
 
-        s = sn_launch_sequence_get_name (sequence);
+        s = sn_startup_sequence_get_id (sequence);
+        printf (" id %s\n", s ? s : "(unset)");
+        
+        s = sn_startup_sequence_get_name (sequence);
         printf (" name %s\n", s ? s : "(unset)");
 
-        s = sn_launch_sequence_get_description (sequence);
+        s = sn_startup_sequence_get_description (sequence);
         printf (" description %s\n", s ? s : "(unset)");
 
         printf (" workspace %d\n",
-                sn_launch_sequence_get_workspace (sequence));
-
-        printf (" %s cancel\n",
-                sn_launch_sequence_get_supports_cancel (sequence) ?
-                "supports" : "does not support");
-        
-        if (sn_launch_sequence_get_geometry (sequence,
-                                             &x, &y, &w, &h))
-          printf (" geometry %d,%d %d x %d window 0x%lx\n",
-                  x, y, w, h,
-                  sn_launch_sequence_get_geometry_window (sequence));
-        else
-          printf (" no geometry set\n");
-
-        printf (" pid %d\n",
-                sn_launch_sequence_get_pid (sequence));
+                sn_startup_sequence_get_workspace (sequence));        
         
-        s = sn_launch_sequence_get_binary_name (sequence);
+        s = sn_startup_sequence_get_binary_name (sequence);
         printf (" binary name %s\n", s ? s : "(unset)");
-        s = sn_launch_sequence_get_icon_name (sequence);
+        s = sn_startup_sequence_get_icon_name (sequence);
         printf (" icon name %s\n", s ? s : "(unset)");
-        s = sn_launch_sequence_get_hostname (sequence);
-        printf (" hostname %s\n", s ? s : "(unset)");
         
-        s = sn_launch_sequence_get_legacy_resource_class (sequence);
-        printf (" legacy class %s\n", s ? s : "(unset)");
-        s = sn_launch_sequence_get_legacy_resource_name (sequence);
-        printf (" legacy name %s\n", s ? s : "(unset)");
-        s = sn_launch_sequence_get_legacy_window_title (sequence);
-        printf (" legacy title %s\n", s ? s : "(unset)");        
+        s = sn_startup_sequence_get_wmclass (sequence);
+        printf (" wm class %s\n", s ? s : "(unset)");
       }
       break;
 
     case SN_MONITOR_EVENT_COMPLETED:
       printf ("Completed sequence %s\n",
-              sn_launch_sequence_get_id (sequence));
+              sn_startup_sequence_get_id (sequence));
       break;
 
     case SN_MONITOR_EVENT_CANCELED:
       printf ("Canceled sequence %s\n",
-              sn_launch_sequence_get_id (sequence));
-      break;
-
-    case SN_MONITOR_EVENT_PULSE:
-      printf ("Pulse for sequence %s\n",
-              sn_launch_sequence_get_id (sequence));
-      break;
-      
-    case SN_MONITOR_EVENT_GEOMETRY_CHANGED:
-      {
-        int x, y, w, h;
-
-        printf ("Geometry changed for sequence %s\n",
-                sn_launch_sequence_get_id (sequence));
-        if (sn_launch_sequence_get_geometry (sequence,
-                                             &x, &y, &w, &h))
-          printf (" geometry %d,%d %d x %d window 0x%lx\n",
-                  x, y, w, h,
-                  sn_launch_sequence_get_geometry_window (sequence));
-        else
-          printf (" no geometry set\n");
-      }
-      break;
-    case SN_MONITOR_EVENT_PID_CHANGED:
-      {
-        printf ("PID for sequence %s is now %d\n",
-                sn_launch_sequence_get_id (sequence),
-                sn_launch_sequence_get_pid (sequence));
-      }
-      break;
-    case SN_MONITOR_EVENT_WORKSPACE_CHANGED:
-      {
-        printf ("Workspace for sequence %s is now %d\n",
-                sn_launch_sequence_get_id (sequence),
-                sn_launch_sequence_get_workspace (sequence));
-      }
+              sn_startup_sequence_get_id (sequence));
       break;
     }
 }
@@ -166,7 +111,7 @@ main (int argc, char **argv)
                             error_trap_push,
                             error_trap_pop);
 
-  context = sn_monitor_context_new (display,
+  context = sn_monitor_context_new (display, DefaultScreen (xdisplay),
                                     monitor_event_func,
                                     NULL, NULL);  
   
diff --git a/test/test-send-xmessage.c b/test/test-send-xmessage.c
index 00ae71a..d1c0a6f 100644
--- a/test/test-send-xmessage.c
+++ b/test/test-send-xmessage.c
@@ -56,7 +56,7 @@ main (int argc, char **argv)
                             error_trap_push,
                             error_trap_pop);
   
-  sn_internal_broadcast_xmessage (display,
+  sn_internal_broadcast_xmessage (display, DefaultScreen (xdisplay),
                                   argv[1],
                                   argv[2]);
   
diff --git a/test/test-watch-xmessages.c b/test/test-watch-xmessages.c
index 85728a5..3374f0e 100644
--- a/test/test-watch-xmessages.c
+++ b/test/test-watch-xmessages.c
@@ -32,6 +32,7 @@
 static void
 message_func (SnDisplay       *display,
               const char      *message_type,
+              Window           xwindow,
               const char      *message,
               void            *user_data)
 {
@@ -100,7 +101,7 @@ main (int argc, char **argv)
                             error_trap_push,
                             error_trap_pop);
 
-  sn_internal_add_xmessage_func (display,
+  sn_internal_add_xmessage_func (display, DefaultScreen (xdisplay),
                                  argv[1],
                                  message_func,
                                  NULL, NULL);