Changeset 75 in Sophya

Timestamp:

Feb 13, 1998, 5:17:14 PM (28 years ago)

Author:

ansari

Message:

Modifs interface copier/coller, et fonction PrefSize() ds PIApplication

Reza 13/02/98

Location:

trunk/SophyaPI/PI

Files:

• piapplgen.h (modified) (1 diff)
• piapplx.cc (modified) (1 diff)
• piapplx.h (modified) (1 diff)
• piwdggen.h (modified) (2 diffs)
• piwdgx.cc (modified) (6 diffs)
• piwdgx.h (modified) (1 diff)

trunk/SophyaPI/PI/piapplgen.h

@@ -27 +27 @@
 
         virtual void              AppendMenu(PIPDMenu *pdm);
+
+        virtual int               PrefXSize() = 0;
+        virtual int               PrefYSize() = 0;
+
 protected:
     PIContainer               *topcont;

trunk/SophyaPI/PI/piapplx.cc

@@ -138 +138 @@
   }
 }
+
+
+/* --Methode-- */
+int PIApplicationX::PrefXSize()
+{
+  return(10);  // $CHECK$ A remplacer Reza 13/02/98 
+}
+
+/* --Methode-- */
+int PIApplicationX::PrefYSize()
+{
+  return(18);  // $CHECK$ A remplacer Reza 13/02/98 
+}
+
+

trunk/SophyaPI/PI/piapplx.h

@@ -20 +20 @@
   virtual void    SetBlocked();
 
+  virtual int     PrefXSize();
+  virtual int     PrefYSize();
+
   PIContainer*    MBCont() { return intcont; }
 protected:

trunk/SophyaPI/PI/piwdggen.h

@@ -17 +17 @@
   PIBK_fixed = 1,
   PIBK_elastic = 2
+};
+
+enum PICopyPasteKind {    // Pour gerer les types d objets echange en copier/coller
+  PICP_string = 1
 };
 
@@ -68 +72 @@
 
 //  Gestion de copier-coller
-  virtual bool           ClaimSelection()=0;
-  virtual void           LoseSelection()=0;
-  virtual void           RequestSelection()=0;
-  virtual void           CopyFromSelection(char *, int l)=0;
-  virtual char*          SelectionString(int& len)=0;
+  virtual bool           ClaimSelection(int typ=PICP_string)            = 0;
+  virtual void           SelectionLost()                                = 0;
+  virtual int            RequestSelection(int typ=PICP_string)          = 0;
+  virtual void*          ProvideSelection(int& typ, int& len)           = 0;
+  virtual void           PasteSelection(int& typ, void *, int l)        = 0;
 
 protected:

trunk/SophyaPI/PI/piwdgx.cc

@@ -497 +497 @@
 if (!curselwdg)  return(FALSE);
 int l;
-*value = curselwdg->SelectionString(l);
+int styp = 1;
+*value = curselwdg->ProvideSelection(styp, l);
 *len=l;
 *typ = XA_STRING;
@@ -507 +508 @@
 void forXt_LoseSelection(Widget w, Atom* sel)
 {
-if (curselwdg)  curselwdg->LoseSelection();
+if (curselwdg)  curselwdg->SelectionLost();
 curselwdg = NULL;
 }
@@ -524 +525 @@
 printf("forXt_SelectionValue()/Debug: %lx %lx - %lx - %d \n", (unsigned long)w,
        (unsigned long)usd, (unsigned long)value, (*len));
+int styp = 1;
 if ( (value != NULL) && (*len > 0) ) 
-  ((PIWdgX*)usd)->CopyFromSelection((char*)value, (*len)) ;
+  ((PIWdgX*)usd)->PasteSelection(styp, (void*)value, (*len)) ;
 }
 
@@ -532 +534 @@
 // Gestion de Copier/Coller
 /* --Methode-- */
-bool PIWdgX::ClaimSelection()
+bool PIWdgX::ClaimSelection(int typ)
+// Pour prendre possession du buffer copier/coller
 {
 if (XtOwnSelection(XtWdg(), XA_PRIMARY, PIXGetLastEventTime(), forXt_ConvertSelection, 
                    forXt_LoseSelection, forXt_DoneSelection) ) {
-  printf("PIWdgX::ClaimSelection() - OK  (Wdg= %lx)\n", (unsigned long)this);
+  printf("PIWdgX::ClaimSelection(%d) - OK  (Wdg= %lx)\n", typ, (unsigned long)this);
   curselwdg = this;
   return (true);
@@ -548 +551 @@
 
 /* --Methode-- */
-void PIWdgX::LoseSelection()
-{
-  printf("PIWdgX::LoseSelection()  Ne fait rien !(Wdg= %lx - %lx) \n", 
+void PIWdgX::SelectionLost()
+// Appele quand le PIWdg perd la possession du buffer copier/coller
+{
+  printf("PIWdgX::SelectionLost()  Ne fait rien !(Wdg= %lx - %lx) \n", 
         (unsigned long)this, (unsigned long)curselwdg);
   if (curselwdg == this)  curselwdg = NULL; 
@@ -556 +560 @@
 
 /* --Methode-- */
-void PIWdgX::RequestSelection()
-{
-printf("PIWdgX::RequestSelection() (Wdg= %lx - %lx) \n", 
+int PIWdgX::RequestSelection(int typ)
+{
+// Pour demander le contenu du buffer de copier/coller
+printf("PIWdgX::RequestSelection(%d) (Wdg= %lx - %lx) \n", typ,  
         (unsigned long)this, (unsigned long)curselwdg);
 XtGetSelectionValue(XtWdg(), XA_PRIMARY, XA_STRING, forXt_SelectionValue, 
                     (XtPointer)this, PIXGetLastEventTime());
-}
-
-/* --Methode-- */
-void PIWdgX::CopyFromSelection(char * sv, int l)
-{
-char* buff = new char[l+2];
-strncpy(buff, sv, l);
-buff[l] = '\0';
-printf("PIWdgX::RequestSelection() L=%d [%s] \n", l, buff);
-delete buff;
-return;
-}
-
-/* --Methode-- */
-char* PIWdgX::SelectionString(int& len)
-{
-char *rs = new char[60];
-strcpy(rs, "Test-of-PIWdgX::SelectionString()");
+return(1);
+}
+
+
+/* --Methode-- */
+void* PIWdgX::ProvideSelection(int& typ, int& len)
+// Le widget doit fournier une l zone memoire contenant la selection
+// en un type donne
+// Renvoie le pointeur de cette zone, sa taille et son typ
+{
+char *rs = new char[80];
+sprintf(rs, "Test-of-PIWdgX::ProvideSelection(%d)", typ);
 len = strlen(rs);
 return(rs);
 }
+
+/* --Methode-- */
+void PIWdgX::PasteSelection(int& typ, void *buff, int l)
+{
+// Methode appele apres que le widget ait fait RequestSelection
+// Le typ de donnees fourni ainsi que les donnees et leur taille 
+// sont en argument 
+char* mbuff = new char[l+1];
+strncpy(mbuff, (char *)buff, l);
+mbuff[l] = '\0';
+printf("PIWdgX::PasteSelection() L=%d [%s] \n", l, mbuff);
+delete[] mbuff;
+return;
+}

trunk/SophyaPI/PI/piwdgx.h

@@ -56 +56 @@
 
 //  Gestion de copier-coller
-  virtual bool           ClaimSelection();
-  virtual void           LoseSelection();
-  virtual void           RequestSelection();
-  virtual void           CopyFromSelection(char *, int l);
-  virtual char*          SelectionString(int& len);
+  virtual bool           ClaimSelection(int typ=PICP_string);
+  virtual void           SelectionLost();
+  virtual int            RequestSelection(int typ=PICP_string);
+  virtual void*          ProvideSelection(int& typ, int& len);
+  virtual void           PasteSelection(int& typ, void *, int l);
 
   inline SysDWdg XtWdg() const {return(sdw); };