[xiph-cvs] cvs commit: snatch x11.c

[Monty]

xiphmont    01/11/04 21:55:26

  Modified:    .        x11.c
  Log:
  Oops, file dialog was different in some versions...

Revision  Changes    Path
1.5       +5 -19     snatch/x11.c

Index: x11.c
===================================================================
RCS file: /usr/local/cvsroot/snatch/x11.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x11.c	2001/11/05 05:39:39	1.4
+++ x11.c	2001/11/05 05:55:26	1.5
@@ -52,9 +52,7 @@
 static int rploc_count=0;
 
 static unsigned long rpfile_shell=0;
-static unsigned long rpfile_entry=0;
 static unsigned long rpfile_main=0;
-static int rpfile_count=0;
 
 static void queue_task(void (*f)(void));
 
@@ -226,14 +224,12 @@
   
   fprintf(stderr,"    ...: filling in file field...\n");
   if(openfile)
-    FakeTypeString(openfile,rpfile_entry);
+    FakeTypeString(openfile,rpfile_main);
 
-  FakeKeySym(XStringToKeysym("Return"),0,rpfile_entry);
+  FakeKeySym(XStringToKeysym("Return"),0,rpfile_main);
 
   rpfile_shell=0;
   rpfile_main=0;
-  rpfile_entry=0;
-  rpfile_count=0;
   
 }
 
@@ -251,8 +247,8 @@
     queue_task(Location);
   }
 
-  if(id==rpfile_entry && rpfile_main){
-    rpfile_main=0;
+  if(id==rpfile_main && rpfile_shell){
+    rpfile_shell=0;
     queue_task(FileEntry);
   }
 }
@@ -348,14 +344,6 @@
     if(parent==rpfile_shell){
       rpfile_main=id;
     }
-    if(parent==rpfile_main){
-      switch(rpfile_count++){
-      case 3:
-	fprintf(stderr,"    ...: text entry: %lx\n",id);
-	rpfile_entry=id;
-	break;
-      }
-    }
   }
 }
 
@@ -486,10 +474,8 @@
   /* watch for the open file window */
   if(n>32 &&  !memcmp(data,"OpenFileDialogShell\0RCACoreAppShell\0",32)){
     fprintf(stderr,
-	    "    ...: RealPlayer popped open file dialog.  Watching for\n"
-	    "         dialog window tree...\n");
+	    "    ...: RealPlayer popped open file dialog.\n");
     rpfile_shell=id;
-    rpfile_entry=0;
     rpfile_main=0;
   }
 }

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.