[Scsh-checkins] CVS: scx/c/xlib property.c,1.4,1.5

[Norbert Freudemann <nofreude@users.sourceforge.net>]

Update of /cvsroot/scsh/scx/c/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv8422

Modified Files:
        property.c 
Log Message:
some fixes


Index: property.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/property.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** property.c  2001/07/11 14:49:34     1.4
--- property.c  2001/07/11 14:59:28     1.5
***************
*** 25,29 ****
  }
  
! s48_value List_Properties (s48_value Xwindow, x48_value Xdisplay){
      int n, i;
      Atom *ap;
--- 25,29 ----
  }
  
! s48_value List_Properties (s48_value Xwindow, s48_value Xdisplay){
      int n, i;
      Atom *ap;
***************
*** 37,43 ****
      S48_GC_PROTECT_1 (v);
      for (i = 0; i < n; i++) {
!       S48_VECTOR_SET(v, i, s48_enter_integer((long) ap[i]))
      }
!     S48_GC_UNPROTECT;
      XFree ((char *)ap);
      return v;
--- 37,43 ----
      S48_GC_PROTECT_1 (v);
      for (i = 0; i < n; i++) {
!       S48_VECTOR_SET(v, i, s48_enter_integer((long) ap[i]));
      }
!     S48_GC_UNPROTECT();
      XFree ((char *)ap);
      return v;
***************
*** 52,56 ****
    unsigned long nitems_ret, bytes_left_ret;
    unsigned char* prop_ret;
!   s48_value ret, x;
  
    S48_DECLARE_GC_PROTECT(2);
--- 52,56 ----
    unsigned long nitems_ret, bytes_left_ret;
    unsigned char* prop_ret;
!   s48_value ret, x, v;
  
    S48_DECLARE_GC_PROTECT(2);
***************
*** 71,79 ****
      if (format_ret == 8){
        char d[nitems_ret+1];
!       bcopy((char *)data, d, (int)nitems_ret);
        d[nitems_ret+1] = (char)0;
        ret = s48_cons (s48_enter_string(d), ret);
      }else{
-       s48_value v;
        // Assumes short is 16 bits and int is 32 bits.
        v = s48_make_vector (nitems_ret, S48_NULL);
--- 71,78 ----
      if (format_ret == 8){
        char d[nitems_ret+1];
!       bcopy((char *)prop_ret, d, (int)nitems_ret);
        d[nitems_ret+1] = (char)0;
        ret = s48_cons (s48_enter_string(d), ret);
      }else{
        // Assumes short is 16 bits and int is 32 bits.
        v = s48_make_vector (nitems_ret, S48_NULL);
***************
*** 81,85 ****
        x = s48_enter_integer (format_ret == 16 ?
        *((short *)prop_ret + i) : *((int *)prop_ret + i));
!       S48_VECTOR_SET(v, i, x;)
        }
        ret = s48_cons(v, ret);
--- 80,84 ----
        x = s48_enter_integer (format_ret == 16 ?
        *((short *)prop_ret + i) : *((int *)prop_ret + i));
!       S48_VECTOR_SET(v, i, x);
        }
        ret = s48_cons(v, ret);
***************
*** 90,94 ****
    ret = s48_cons(s48_enter_integer((long)format_ret), ret);
    ret = s48_cons(s48_enter_integer((long)actual_type_ret), ret);
!   S48_GC_UNPROTECT;
    return ret;
  }
--- 89,93 ----
    ret = s48_cons(s48_enter_integer((long)format_ret), ret);
    ret = s48_cons(s48_enter_integer((long)actual_type_ret), ret);
!   S48_GC_UNPROTECT();
    return ret;
  }
***************
*** 126,130 ****
  
  
! s48_value P_Delete_Property (s48_value Xdisplay, s48_value Xwindow,
                             s48_value Xatom_prop){
    XDeleteProperty (EXTRACT_DISPLAY(Xdisplay), EXTRACT_WINDOW(Xwindow),
--- 125,129 ----
  
  
! s48_value Delete_Property (s48_value Xdisplay, s48_value Xwindow,
                             s48_value Xatom_prop){
    XDeleteProperty (EXTRACT_DISPLAY(Xdisplay), EXTRACT_WINDOW(Xwindow),
***************
*** 141,145 ****
        p[i] = s48_extract_integer(S48_VECTOR_REF(Xatom_vec, i));
    }
!   XRotateWindowProperties(EXTRACT_DISPLAY(Xdisplay), EXTRACT_WINDOW(Xwindwo),
                          p, n, (int)s48_extract_integer(delta));
    return S48_UNSPECIFIC;
--- 140,144 ----
        p[i] = s48_extract_integer(S48_VECTOR_REF(Xatom_vec, i));
    }
!   XRotateWindowProperties(EXTRACT_DISPLAY(Xdisplay), EXTRACT_WINDOW(Xwindow),
                          p, n, (int)s48_extract_integer(delta));
    return S48_UNSPECIFIC;
***************
*** 147,151 ****
  
  s48_value Set_Selection_Owner (s48_value Xdisplay, s48_value Xatom_s,
!                              s48_value Xwindow_owner, s58_value time){
    
    XSetSelectionOwner (EXTRACT_DISPLAY(Xdisplay), EXTRACT_ATOM(Xatom_s),
--- 146,150 ----
  
  s48_value Set_Selection_Owner (s48_value Xdisplay, s48_value Xatom_s,
!                              s48_value Xwindow_owner, s48_value time){
    
    XSetSelectionOwner (EXTRACT_DISPLAY(Xdisplay), EXTRACT_ATOM(Xatom_s),
***************
*** 171,175 ****
  }
  
! viod s48_init_graphics(void) {
    S48_EXPORT_FUNCTION(Intern_Atom);
    S48_EXPORT_FUNCTION(Find_Atom);
--- 170,174 ----
  }
  
! void s48_init_property(void) {
    S48_EXPORT_FUNCTION(Intern_Atom);
    S48_EXPORT_FUNCTION(Find_Atom);
***************
*** 179,183 ****
    S48_EXPORT_FUNCTION(Change_Property);
    S48_EXPORT_FUNCTION(Delete_Property);
!   S48_EXPORT_FUNCTION(Rotate_Property);
    S48_EXPORT_FUNCTION(Set_Selection_Owner);
    S48_EXPORT_FUNCTION(Get_Selection_Owner);
--- 178,182 ----
    S48_EXPORT_FUNCTION(Change_Property);
    S48_EXPORT_FUNCTION(Delete_Property);
!   S48_EXPORT_FUNCTION(Rotate_Properties);
    S48_EXPORT_FUNCTION(Set_Selection_Owner);
    S48_EXPORT_FUNCTION(Get_Selection_Owner);